diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
index 3a55c0f13a22497bbabb949e43fac0c63e62e346..a5235021187a6fcb46c7baff75991cced076482f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
@@ -49,7 +49,7 @@ public class JythonTopLevelDataSetHandlerV2<T extends DataSetInformation> extend
     protected final IJythonInterpreterFactory jythonInterpreterFactory;
 
     // version of jython. Available options are "2.7" and "2.5". Default is jython 2.7
-    public static final String JYTHON_VERSION = "jython-version";
+    public static final String JYTHON_VERSION = "plugin-jython-version";
 
     /**
      * Constructor.
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
index eced767be4a2484df5b3ee6819d3f943a785c234..02528be2a25fb4c99fcb6cdc428b84079c74fc32 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
@@ -80,8 +80,8 @@ public class JythonDropboxRecoveryTest extends AbstractJythonDataSetHandlerTest
         LinkedList<RecoveryTestCase> testCasesWithJython27 = recoveryTestCases();
         for (RecoveryTestCase recoveryTestCase : testCasesWithJython27)
         {
-            recoveryTestCase.overrideProperties.put("jython-version", "2.7");
-            recoveryTestCase.title += " @ jython 2.7";
+            recoveryTestCase.overrideProperties.put("plugin-jython-version", "2.5");
+            recoveryTestCase.title += " @ jython 2.5";
         }
         testCases.addAll(testCasesWithJython27);