diff --git a/ccm-core/src/main/java/org/libreccm/api/ExtractedIdentifier.java b/ccm-core/src/main/java/org/libreccm/api/Identifier.java
similarity index 94%
rename from ccm-core/src/main/java/org/libreccm/api/ExtractedIdentifier.java
rename to ccm-core/src/main/java/org/libreccm/api/Identifier.java
index cfa1d0dc9..319ce1021 100644
--- a/ccm-core/src/main/java/org/libreccm/api/ExtractedIdentifier.java
+++ b/ccm-core/src/main/java/org/libreccm/api/Identifier.java
@@ -22,13 +22,13 @@ package org.libreccm.api;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class ExtractedIdentifier {
+public class Identifier {
 
     private final IdentifierType type;
 
     private final String identifier;
 
-    protected ExtractedIdentifier(
+    protected Identifier(
         final IdentifierType type, final String identifier
     ) {
         this.type = type;
diff --git a/ccm-core/src/main/java/org/libreccm/api/IdentifierExtractor.java b/ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java
similarity index 83%
rename from ccm-core/src/main/java/org/libreccm/api/IdentifierExtractor.java
rename to ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java
index 020181767..3bf741b4a 100644
--- a/ccm-core/src/main/java/org/libreccm/api/IdentifierExtractor.java
+++ b/ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java
@@ -27,22 +27,22 @@ import javax.enterprise.context.Dependent;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Dependent
-public class IdentifierExtractor {
+public class IdentifierParser {
 
-    public ExtractedIdentifier extractIdentifier(final String identifierParam) {
+    public Identifier extractIdentifier(final String identifierParam) {
         Objects.requireNonNull(identifierParam, "identifier param is null.");
 
         if (identifierParam.startsWith(ApiConstants.IDENTIFIER_PREFIX_ID)) {
             final String identifier = identifierParam
                 .substring(ApiConstants.IDENTIFIER_PREFIX_ID.length());
-            return new ExtractedIdentifier(IdentifierType.ID, identifier);
+            return new Identifier(IdentifierType.ID, identifier);
         } else if (identifierParam.startsWith(
             ApiConstants.IDENTIFIER_PREFIX_UUID)) {
             final String identifier = identifierParam
                 .substring(ApiConstants.IDENTIFIER_PREFIX_UUID.length());
-            return new ExtractedIdentifier(IdentifierType.ID, identifier);
+            return new Identifier(IdentifierType.ID, identifier);
         } else {
-            return new ExtractedIdentifier(
+            return new Identifier(
                 IdentifierType.PROPERTY, identifierParam
             );
         }
diff --git a/ccm-core/src/main/java/org/libreccm/api/admin/security/RolesApi.java b/ccm-core/src/main/java/org/libreccm/api/admin/security/RolesApi.java
index d9fa0dedf..394ae3801 100644
--- a/ccm-core/src/main/java/org/libreccm/api/admin/security/RolesApi.java
+++ b/ccm-core/src/main/java/org/libreccm/api/admin/security/RolesApi.java
@@ -5,8 +5,8 @@
  */
 package org.libreccm.api.admin.security;
 
-import org.libreccm.api.ExtractedIdentifier;
-import org.libreccm.api.IdentifierExtractor;
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
 import org.libreccm.core.CcmObjectRepository;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.api.admin.security.dto.RoleData;
@@ -61,7 +61,7 @@ public class RolesApi {
     private CcmObjectRepository ccmObjectRepository;
 
     @Inject
-    private IdentifierExtractor identifierExtractor;
+    private IdentifierParser identifierExtractor;
 
     @Inject
     private PartyRepository partyRepository;
@@ -344,7 +344,7 @@ public class RolesApi {
     ) {
         final Role role = repository.findRole(roleIdentifier);
 
-        final ExtractedIdentifier permissionIdentifier = identifierExtractor
+        final Identifier permissionIdentifier = identifierExtractor
             .extractIdentifier(roleIdentifier);
 
         final Permission permission;
diff --git a/ccm-core/src/main/java/org/libreccm/api/admin/security/SecurityApiRepository.java b/ccm-core/src/main/java/org/libreccm/api/admin/security/SecurityApiRepository.java
index f6e031b69..210fbca62 100644
--- a/ccm-core/src/main/java/org/libreccm/api/admin/security/SecurityApiRepository.java
+++ b/ccm-core/src/main/java/org/libreccm/api/admin/security/SecurityApiRepository.java
@@ -18,8 +18,8 @@
  */
 package org.libreccm.api.admin.security;
 
-import org.libreccm.api.ExtractedIdentifier;
-import org.libreccm.api.IdentifierExtractor;
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
 import org.libreccm.security.Group;
 import org.libreccm.security.GroupRepository;
 import org.libreccm.security.Party;
@@ -50,7 +50,7 @@ class SecurityApiRepository {
     private GroupRepository groupRepository;
     
     @Inject
-    private IdentifierExtractor identifierExtractor;
+    private IdentifierParser identifierExtractor;
     
     @Inject
     private PartyRepository partyRepository;
@@ -62,7 +62,7 @@ class SecurityApiRepository {
     private UserRepository userRepository;
     
     protected Group findGroup(final String groupIdentifier) {
-        final ExtractedIdentifier identifier = identifierExtractor
+        final Identifier identifier = identifierExtractor
             .extractIdentifier(groupIdentifier);
 
         switch (identifier.getType()) {
@@ -106,7 +106,7 @@ class SecurityApiRepository {
     }
     
      protected Party findParty(final String partyIdentifier) {
-        final ExtractedIdentifier identifier = identifierExtractor
+        final Identifier identifier = identifierExtractor
             .extractIdentifier(partyIdentifier);
 
         switch (identifier.getType()) {
@@ -151,7 +151,7 @@ class SecurityApiRepository {
 
     
     protected Role findRole(final String roleIdentifier) {
-        final ExtractedIdentifier identifier = identifierExtractor
+        final Identifier identifier = identifierExtractor
             .extractIdentifier(roleIdentifier);
 
         switch (identifier.getType()) {
@@ -195,7 +195,7 @@ class SecurityApiRepository {
     }
     
      protected User findUser(final String identifierParam) {
-        final ExtractedIdentifier identifier = identifierExtractor
+        final Identifier identifier = identifierExtractor
             .extractIdentifier(identifierParam);
 
         switch (identifier.getType()) {