diff --git a/README.md b/README.md
index 0a9b0b4c6..ff93c9285 100644
--- a/README.md
+++ b/README.md
@@ -57,10 +57,10 @@ $ java -jar ./examples/hawkbit-mgmt-api-client/target/hawkbit-mgmt-api-client-#v
 
 
 # Modules
-`hawkbit-core` : core elements.  
-`hawkbit-security-core` : core security elements.  
-`hawkbit-security-integration` : security integration elements to integrate security into hawkbit.  
-`hawkbit-artifact-repository-mongo` : artifact repository implementation to mongoDB.    
+`hawkbit-core` : internal interfaces and utility classes..  
+`hawkbit-security-core` : authentication and authorization.  
+`hawkbit-security-integration` : authentication and authorization integrated with the APIs.  
+`hawkbit-artifact-repository-mongo` : artifact repository implementation to MongoDB.    
 `hawkbit-autoconfigure` : spring-boot auto-configuration.  
 `hawkbit-dmf-api` : API for the Device Management Integration.  
 `hawkbit-dmf-amqp` : AMQP endpoint implementation for the DMF API.  
diff --git a/hawkbit-core/README.md b/hawkbit-core/README.md
new file mode 100644
index 000000000..bf75314d1
--- /dev/null
+++ b/hawkbit-core/README.md
@@ -0,0 +1,3 @@
+# hawkBit Core
+
+Various internal interfaces and utility classes.
\ No newline at end of file
diff --git a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProvider.java b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProvider.java
index b81b76e5c..b4960737d 100644
--- a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProvider.java
+++ b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProvider.java
@@ -24,11 +24,11 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
 
 /**
- * An spring authentication provider which supportes authentication tokens of
+ * An spring authentication provider which supports authentication tokens of
  * type {@link PreAuthenticatedAuthenticationToken} created by the
  * {@link ControllerPreAuthenticatedSecurityHeaderFilter}.
  * 
- * Addtionally to the authentication token providing the principal and the
+ * Additionally to the authentication token providing the principal and the
  * credentials which must be match, this authentication provider can also check
  * the remote IP address of the request.
  *