diff --git a/src/main/java/ch/eitchnet/privilege/i18n/PrivilegeMessages.java b/src/main/java/ch/eitchnet/privilege/i18n/PrivilegeMessages.java
index c84da0b69..da80d9f63 100644
--- a/src/main/java/ch/eitchnet/privilege/i18n/PrivilegeMessages.java
+++ b/src/main/java/ch/eitchnet/privilege/i18n/PrivilegeMessages.java
@@ -29,7 +29,7 @@ import java.util.ResourceBundle;
  *
  */
 public class PrivilegeMessages {
-	private static final String BUNDLE_NAME = "ch.eitchnet.privilege.i18n.PrivilegeMessages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "PrivilegeMessages"; //$NON-NLS-1$
 
 	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
 
diff --git a/src/main/java/ch/eitchnet/privilege/i18n/PrivilegeMessages.properties b/src/main/resources/PrivilegeMessages.properties
similarity index 100%
rename from src/main/java/ch/eitchnet/privilege/i18n/PrivilegeMessages.properties
rename to src/main/resources/PrivilegeMessages.properties