diff --git a/s-pipes-modules/module-nlp/src/main/java/cz/cvut/spipes/modules/SUTimeModuleNew.java b/s-pipes-modules/module-nlp/src/main/java/cz/cvut/spipes/modules/SUTimeModuleNew.java
index b2fdeb7b..83334042 100644
--- a/s-pipes-modules/module-nlp/src/main/java/cz/cvut/spipes/modules/SUTimeModuleNew.java
+++ b/s-pipes-modules/module-nlp/src/main/java/cz/cvut/spipes/modules/SUTimeModuleNew.java
@@ -93,9 +93,9 @@ public void loadConfiguration() {
         }
         parseText = this.getPropertyValue(KBSS_MODULE.JENA.is_parse_text, true);
         pageSize = this.getPropertyValue(P_PAGE_SIZE, DEFAULT_PAGE_SIZE);
-        constructQueries = getResourcesByProperty(SML.constructQuery);
+        constructQueries = getResourcesByProperty(SML.JENA.constructQuery);
 
-        isReplace = this.getPropertyValue(SML.replace, false);
+        isReplace = this.getPropertyValue(SML.JENA.replace, false);
     }
 
     @Override
diff --git a/s-pipes-modules/module-rdf4j/src/main/java/cz/cvut/spipes/modules/Rdf4jUpdateModule.java b/s-pipes-modules/module-rdf4j/src/main/java/cz/cvut/spipes/modules/Rdf4jUpdateModule.java
index de1385f7..f10a2f48 100644
--- a/s-pipes-modules/module-rdf4j/src/main/java/cz/cvut/spipes/modules/Rdf4jUpdateModule.java
+++ b/s-pipes-modules/module-rdf4j/src/main/java/cz/cvut/spipes/modules/Rdf4jUpdateModule.java
@@ -208,7 +208,7 @@ public void loadConfiguration() {
     }
 
     private List<String> loadUpdateQueries() {
-        return getResourcesByProperty(SML.updateQuery).stream().map(
+        return getResourcesByProperty(SML.JENA.updateQuery).stream().map(
             r -> r.getProperty(SP.text).getLiteral().getString()).collect(Collectors.toList());
     }
 }
diff --git a/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructAbstractModule.java b/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructAbstractModule.java
index ab76a868..4efd352a 100644
--- a/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructAbstractModule.java
+++ b/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructAbstractModule.java
@@ -178,12 +178,12 @@ public void loadConfiguration() {
         // TODO load default values from configuration
 
         // TODO does not work with string query as object is not RDF resource ???
-        constructQueries = getResourcesByProperty(SML.constructQuery);
+        constructQueries = getResourcesByProperty(SML.JENA.constructQuery);
 
         log.debug("Loaded {} spin construct queries.", constructQueries.size());
 
         //TODO default value must be taken from template definition
-        isReplace = this.getPropertyValue(SML.replace, false);
+        isReplace = this.getPropertyValue(SML.JENA.replace, false);
 
         parseText = this.getPropertyValue(KBSS_MODULE.JENA.is_parse_text, true);
         iterationCount = this.getPropertyValue(KBSS_MODULE.JENA.has_max_iteration_count, -1);
diff --git a/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesAndScrollableCursorModule.java b/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesAndScrollableCursorModule.java
index 8be85ee3..7008abc8 100644
--- a/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesAndScrollableCursorModule.java
+++ b/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesAndScrollableCursorModule.java
@@ -116,7 +116,7 @@ public void loadConfiguration() {
         //iterationCount = this.getPropertyValue(KBSS_MODULE.JENA.s_max_iteration_count, 1);
         parseText = this.getPropertyValue(KBSS_MODULE.JENA.is_parse_text, true);
         chunkSize = this.getPropertyValue(P_CHUNK_SIZE, DEFAULT_CHUNK_SIZE);
-        selectQuery = getPropertyValue(SML.selectQuery).asResource().as(Select.class);
+        selectQuery = getPropertyValue(SML.JENA.selectQuery).asResource().as(Select.class);
         pageSize = this.getPropertyValue(P_PAGE_SIZE, DEFAULT_PAGE_SIZE);
     }
 
diff --git a/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesModule.java b/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesModule.java
index e91e0ab5..cc79f722 100644
--- a/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesModule.java
+++ b/s-pipes-modules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesModule.java
@@ -123,7 +123,7 @@ public void loadConfiguration() {
         //iterationCount = this.getPropertyValue(KBSS_MODULE.JENA.s_max_iteration_count, 1);
         parseText = this.getPropertyValue(KBSS_MODULE.JENA.is_parse_text, true);
         chunkSize = this.getPropertyValue(P_CHUNK_SIZE, DEFAULT_CHUNK_SIZE);
-        selectQuery = getPropertyValue(SML.selectQuery).asResource().as(Select.class);
+        selectQuery = getPropertyValue(SML.JENA.selectQuery).asResource().as(Select.class);
     }
 
     @NotNull
diff --git a/s-pipes-modules/module-tarql/src/main/java/cz/cvut/spipes/modules/TarqlModule.java b/s-pipes-modules/module-tarql/src/main/java/cz/cvut/spipes/modules/TarqlModule.java
index b6ece902..1db616a0 100644
--- a/s-pipes-modules/module-tarql/src/main/java/cz/cvut/spipes/modules/TarqlModule.java
+++ b/s-pipes-modules/module-tarql/src/main/java/cz/cvut/spipes/modules/TarqlModule.java
@@ -151,7 +151,7 @@ public void loadConfiguration() {
 
         // TODO does not work with string query as object is not RDF resource ???
         constructQueries = resource
-                .listProperties(SML.constructQuery)
+                .listProperties(SML.JENA.constructQuery)
                 .toList().stream()
                 .map(st -> st.getObject().asResource())
                 .collect(Collectors.toList());
diff --git a/s-pipes-modules/module-text-analysis/src/main/java/cz/cvut/spipes/modules/TextAnalysisModule.java b/s-pipes-modules/module-text-analysis/src/main/java/cz/cvut/spipes/modules/TextAnalysisModule.java
index 6af15a07..5332f23b 100644
--- a/s-pipes-modules/module-text-analysis/src/main/java/cz/cvut/spipes/modules/TextAnalysisModule.java
+++ b/s-pipes-modules/module-text-analysis/src/main/java/cz/cvut/spipes/modules/TextAnalysisModule.java
@@ -192,7 +192,7 @@ private String annotateObjectLiteral(String objectValue) {
     @Override
     public void loadConfiguration() {
         super.loadConfiguration();
-        selectQuery = getPropertyValue(SML.selectQuery).asResource().as(Select.class);
+        selectQuery = getPropertyValue(SML.JENA.selectQuery).asResource().as(Select.class);
     }
 
     @Override