diff --git a/build.gradle b/build.gradle
index 4925ecd..b5cec8a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,7 @@ repositories {
 
 dependencies {
     // Symbiote Security section
-    compile('com.github.symbiote-h2020:SymbIoTeSecurity:[27.4,27.999]'){ changing = true }
+    compile('com.github.symbiote-h2020:SymbIoTeSecurity:[27.5,27.999]'){ changing = true }
     // allows to select the downloaded matching sources in IntelliJ Idea as it fails to do so automatically from jitpack repo
 	//compile('com.github.symbiote-h2020:SymbIoTeSecurity:[27.2,27.999]:sources'){ changing = true }
 	//compile project(':SymbIoTeSecurity')
diff --git a/src/main/java/eu/h2020/symbiote/cloud/monitoring/model/CloudMonitoringPlatform.java b/src/main/java/eu/h2020/symbiote/cloud/monitoring/model/CloudMonitoringPlatform.java
index 65c56c4..1486bb3 100644
--- a/src/main/java/eu/h2020/symbiote/cloud/monitoring/model/CloudMonitoringPlatform.java
+++ b/src/main/java/eu/h2020/symbiote/cloud/monitoring/model/CloudMonitoringPlatform.java
@@ -15,7 +15,7 @@
 public class CloudMonitoringPlatform {
 
 	/**
-	 * Simple Data, is the Platform constants Id
+	 * Simple Data, is the Platform internal Id
 	 */
 	private String platformId;
 	
@@ -26,7 +26,7 @@ public class CloudMonitoringPlatform {
 	
 	
 	/**
-	 * Simple Data, is the Platform constants Id
+	 * Simple Data, is the Platform internal Id
 	 * @return Platform platformId
 	 */
 	public String getPlatformId() {
diff --git a/src/main/java/eu/h2020/symbiote/core/internal/ClearDataRequest.java b/src/main/java/eu/h2020/symbiote/core/internal/ClearDataRequest.java
index 825b502..5cf995f 100644
--- a/src/main/java/eu/h2020/symbiote/core/internal/ClearDataRequest.java
+++ b/src/main/java/eu/h2020/symbiote/core/internal/ClearDataRequest.java
@@ -4,7 +4,7 @@
 import eu.h2020.symbiote.security.communication.payloads.SecurityRequest;
 
 /**
- * Core constants payload of clear data message.
+ * Core internal payload of clear data message.
  *
  * Created by Szymon Mueller on 09/11/2017.
  */
diff --git a/src/main/java/eu/h2020/symbiote/core/internal/ClearDataResponse.java b/src/main/java/eu/h2020/symbiote/core/internal/ClearDataResponse.java
index 3067ac4..ec3a851 100644
--- a/src/main/java/eu/h2020/symbiote/core/internal/ClearDataResponse.java
+++ b/src/main/java/eu/h2020/symbiote/core/internal/ClearDataResponse.java
@@ -3,7 +3,7 @@
 import eu.h2020.symbiote.core.cci.AbstractResponseSecured;
 
 /**
- * Core constants payload of clear data message.
+ * Core internal payload of clear data message.
  *
  * Created by Szymon Mueller on 09/11/2017.
  */
diff --git a/src/main/java/eu/h2020/symbiote/core/internal/CoreResource.java b/src/main/java/eu/h2020/symbiote/core/internal/CoreResource.java
index 32d6d33..23988c2 100644
--- a/src/main/java/eu/h2020/symbiote/core/internal/CoreResource.java
+++ b/src/main/java/eu/h2020/symbiote/core/internal/CoreResource.java
@@ -4,7 +4,7 @@
 import eu.h2020.symbiote.security.accesspolicies.common.IAccessPolicySpecifier;
 
 /**
- * Core layer constants representation of the resource. Extends the generic Resource description with RDF representation of the resource.
+ * Core layer internal representation of the resource. Extends the generic Resource description with RDF representation of the resource.
  *
  * Registry component is storing instances of this class and information about new resources in the system does also contain information in this form.
  *
diff --git a/src/main/java/eu/h2020/symbiote/core/internal/CoreResourceRegistryRequest.java b/src/main/java/eu/h2020/symbiote/core/internal/CoreResourceRegistryRequest.java
index 1f14807..aae13b1 100644
--- a/src/main/java/eu/h2020/symbiote/core/internal/CoreResourceRegistryRequest.java
+++ b/src/main/java/eu/h2020/symbiote/core/internal/CoreResourceRegistryRequest.java
@@ -7,7 +7,7 @@
 import java.util.Map;
 
 /**
- * Payload of constants Core communication message for registry operation on resources (both RDF and JSON).
+ * Payload of internal Core communication message for registry operation on resources (both RDF and JSON).
  * Used in communication between CloudCoreInterface and Registry.
  * <p>
  * Created by Szymon Mueller on 31/03/2017.
diff --git a/src/main/java/eu/h2020/symbiote/core/internal/CoreResourceRegistryResponse.java b/src/main/java/eu/h2020/symbiote/core/internal/CoreResourceRegistryResponse.java
index a593f77..2169f44 100644
--- a/src/main/java/eu/h2020/symbiote/core/internal/CoreResourceRegistryResponse.java
+++ b/src/main/java/eu/h2020/symbiote/core/internal/CoreResourceRegistryResponse.java
@@ -3,7 +3,7 @@
 import eu.h2020.symbiote.core.cci.AbstractResponseSecured;
 
 /**
- * Payload of responses to constants Core communication message for registry operation on resources (both RDF and JSON).
+ * Payload of responses to internal Core communication message for registry operation on resources (both RDF and JSON).
  * Used in communication between CloudCoreInterface and Registry.
  * <p>
  * Created by Szymon Mueller on 31/03/2017.
diff --git a/src/main/java/eu/h2020/symbiote/util/RabbitConstants.java b/src/main/java/eu/h2020/symbiote/util/RabbitConstants.java
index bb5129b..4929f88 100644
--- a/src/main/java/eu/h2020/symbiote/util/RabbitConstants.java
+++ b/src/main/java/eu/h2020/symbiote/util/RabbitConstants.java
@@ -6,31 +6,31 @@ public interface RabbitConstants {
 	String EXCHANGE_RH_TYPE_PROPERTY = "rabbit.exchange.rh.type";
 	String EXCHANGE_RH_DURABLE_PROPERTY = "rabbit.exchange.rh.durable";
 	String EXCHANGE_RH_AUTODELETE_PROPERTY = "rabbit.exchange.rh.autodelete";
-	String EXCHANGE_RH_INTERNAL_PROPERTY = "rabbit.exchange.rh.constants";
+	String EXCHANGE_RH_INTERNAL_PROPERTY = "rabbit.exchange.rh.internal";
 
 	String EXCHANGE_RAP_NAME_PROPERTY = "rabbit.exchange.rap.name";
 	String EXCHANGE_RAP_TYPE_PROPERTY = "rabbit.exchange.rap.type";
 	String EXCHANGE_RAP_DURABLE_PROPERTY = "rabbit.exchange.rap.durable";
 	String EXCHANGE_RAP_AUTODELETE_PROPERTY = "rabbit.exchange.rap.autodelete";
-	String EXCHANGE_RAP_INTERNAL_PROPERTY = "rabbit.exchange.rap.constants";
+	String EXCHANGE_RAP_INTERNAL_PROPERTY = "rabbit.exchange.rap.internal";
 
 	String EXCHANGE_TRUST_NAME_PROPERTY = "rabbit.exchange.trust.name";
 	String EXCHANGE_TRUST_TYPE_PROPERTY = "rabbit.exchange.trust.type";
 	String EXCHANGE_TRUST_DURABLE_PROPERTY = "rabbit.exchange.trust.durable";
 	String EXCHANGE_TRUST_AUTODELETE_PROPERTY = "rabbit.exchange.trust.autodelete";
-	String EXCHANGE_TRUST_INTERNAL_PROPERTY = "rabbit.exchange.trust.constants";
+	String EXCHANGE_TRUST_INTERNAL_PROPERTY = "rabbit.exchange.trust.internal";
 
 	String EXCHANGE_PLATFORM_REGISTRY_NAME_PROPERTY = "rabbit.exchange.platformRegistry.name";
 	String EXCHANGE_PLATFORM_REGISTRY_TYPE_PROPERTY = "rabbit.exchange.platformRegistry.type";
 	String EXCHANGE_PLATFORM_REGISTRY_DURABLE_PROPERTY = "rabbit.exchange.platformRegistry.durable";
 	String EXCHANGE_PLATFORM_REGISTRY_AUTODELETE_PROPERTY = "rabbit.exchange.platformRegistry.autodelete";
-	String EXCHANGE_PLATFORM_REGISTRY_INTERNAL_PROPERTY = "rabbit.exchange.platformRegistry.constants";
+	String EXCHANGE_PLATFORM_REGISTRY_INTERNAL_PROPERTY = "rabbit.exchange.platformRegistry.internal";
 
 	String EXCHANGE_SLA_NAME_PROPERTY = "rabbit.exchange.sla.name";
 	String EXCHANGE_SLA_TYPE_PROPERTY = "rabbit.exchange.sla.type";
 	String EXCHANGE_SLA_DURABLE_PROPERTY = "rabbit.exchange.sla.durable";
 	String EXCHANGE_SLA_AUTODELETE_PROPERTY = "rabbit.exchange.sla.autodelete";
-	String EXCHANGE_SLA_INTERNAL_PROPERTY = "rabbit.exchange.sla.constants";
+	String EXCHANGE_SLA_INTERNAL_PROPERTY = "rabbit.exchange.sla.internal";
 
 	String ROUTING_KEY_RH_REGISTER_PROPERTY = "rabbit.routingKey.rh.core.register";
 	String ROUTING_KEY_RH_UPDATE_PROPERTY = "rabbit.routingKey.rh.core.update";