diff --git a/scm-core/src/main/java/sonia/scm/group/GroupAllreadyExistExeption.java b/scm-core/src/main/java/sonia/scm/group/GroupAlreadyExistsException.java
similarity index 94%
rename from scm-core/src/main/java/sonia/scm/group/GroupAllreadyExistExeption.java
rename to scm-core/src/main/java/sonia/scm/group/GroupAlreadyExistsException.java
index fd4aa77cf2..8389900098 100644
--- a/scm-core/src/main/java/sonia/scm/group/GroupAllreadyExistExeption.java
+++ b/scm-core/src/main/java/sonia/scm/group/GroupAlreadyExistsException.java
@@ -39,7 +39,7 @@ package sonia.scm.group;
  *
  * @author Sebastian Sdorra
  */
-public class GroupAllreadyExistExeption extends GroupException
+public class GroupAlreadyExistsException extends GroupException
 {
 
   /** Field description */
@@ -50,7 +50,7 @@ public class GroupAllreadyExistExeption extends GroupException
    * 
    * @param message exception message
    */
-  public GroupAllreadyExistExeption(String message) {
+  public GroupAlreadyExistsException(String message) {
     super(message);
   }
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
index b76510a36a..fac29c5d63 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -115,7 +115,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
 
     if (directory.exists())
     {
-      throw new RepositoryAllreadyExistExeption();
+      throw new RepositoryAlreadyExistsException();
     }
 
     checkPath(directory);
@@ -411,9 +411,9 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
    *
    * @param directory repository target directory
    *
-   * @throws RepositoryAllreadyExistExeption
+   * @throws RepositoryAlreadyExistsException
    */
-  private void checkPath(File directory) throws RepositoryAllreadyExistExeption
+  private void checkPath(File directory) throws RepositoryAlreadyExistsException
   {
     File repositoryDirectory = config.getRepositoryDirectory();
     File parent = directory.getParentFile();
@@ -432,7 +432,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
           logger.error("parent path {} is a repository", parent);
         }
 
-        throw new RepositoryAllreadyExistExeption();
+        throw new RepositoryAlreadyExistsException();
       }
 
       parent = parent.getParentFile();
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryAllreadyExistExeption.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryAlreadyExistsException.java
similarity index 96%
rename from scm-core/src/main/java/sonia/scm/repository/RepositoryAllreadyExistExeption.java
rename to scm-core/src/main/java/sonia/scm/repository/RepositoryAlreadyExistsException.java
index d035d765e4..5691ee768f 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryAllreadyExistExeption.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryAlreadyExistsException.java
@@ -37,7 +37,7 @@ package sonia.scm.repository;
  *
  * @author Sebastian Sdorra
  */
-public class RepositoryAllreadyExistExeption extends RepositoryException
+public class RepositoryAlreadyExistsException extends RepositoryException
 {
 
   /** Field description */
diff --git a/scm-core/src/main/java/sonia/scm/user/UserAllreadyExistException.java b/scm-core/src/main/java/sonia/scm/user/UserAlreadyExistsException.java
similarity index 93%
rename from scm-core/src/main/java/sonia/scm/user/UserAllreadyExistException.java
rename to scm-core/src/main/java/sonia/scm/user/UserAlreadyExistsException.java
index a8e847b9a8..e640953480 100644
--- a/scm-core/src/main/java/sonia/scm/user/UserAllreadyExistException.java
+++ b/scm-core/src/main/java/sonia/scm/user/UserAlreadyExistsException.java
@@ -41,7 +41,7 @@ import sonia.scm.util.Util;
  *
  * @author Sebastian Sdorra
  */
-public class UserAllreadyExistException extends UserException
+public class UserAlreadyExistsException extends UserException
 {
 
   /** Field description */
@@ -53,7 +53,7 @@ public class UserAllreadyExistException extends UserException
    * Constructs ...
    *
    */
-  public UserAllreadyExistException() {}
+  public UserAlreadyExistsException() {}
 
   /**
    * Constructs ...
@@ -62,7 +62,7 @@ public class UserAllreadyExistException extends UserException
    * @param username
    * @since 1.5
    */
-  public UserAllreadyExistException(String username)
+  public UserAlreadyExistsException(String username)
   {
     super("user \"".concat(Util.nonNull(username)).concat(
       "\" allready exists"));
diff --git a/scm-test/src/main/java/sonia/scm/repository/RepositoryManagerTestBase.java b/scm-test/src/main/java/sonia/scm/repository/RepositoryManagerTestBase.java
index 056eccd96d..e8d8caf603 100644
--- a/scm-test/src/main/java/sonia/scm/repository/RepositoryManagerTestBase.java
+++ b/scm-test/src/main/java/sonia/scm/repository/RepositoryManagerTestBase.java
@@ -110,7 +110,7 @@ public abstract class RepositoryManagerTestBase
    * @throws IOException
    * @throws RepositoryException
    */
-  @Test(expected = RepositoryAllreadyExistExeption.class)
+  @Test(expected = RepositoryAlreadyExistsException.class)
   public void testCreateExisting() throws RepositoryException, IOException
   {
     createTestRepository();
diff --git a/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java b/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
index 8799485b07..f3a42a11c1 100644
--- a/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
+++ b/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
@@ -96,7 +96,7 @@ public abstract class SimpleRepositoryHandlerTestBase extends AbstractTestBase
    * @throws IOException
    * @throws RepositoryException
    */
-  @Test(expected = RepositoryAllreadyExistExeption.class)
+  @Test(expected = RepositoryAlreadyExistsException.class)
   public void testCreateExisitingRepository()
           throws RepositoryException, IOException
   {
diff --git a/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java b/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
index 58b1fc3842..86b3de5615 100644
--- a/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
+++ b/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
@@ -94,7 +94,7 @@ public abstract class UserManagerTestBase
    * @throws IOException
    * @throws UserException
    */
-  @Test(expected = UserAllreadyExistException.class)
+  @Test(expected = UserAlreadyExistsException.class)
   public void testCreateExisting() throws UserException, IOException
   {
     User zaphod = UserTestData.createZaphod();
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
index c6c78b0136..674b44c158 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
@@ -56,7 +56,7 @@ import sonia.scm.repository.AdvancedImportHandler;
 import sonia.scm.repository.ImportHandler;
 import sonia.scm.repository.ImportResult;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryAllreadyExistExeption;
+import sonia.scm.repository.RepositoryAlreadyExistsException;
 import sonia.scm.repository.RepositoryException;
 import sonia.scm.repository.RepositoryHandler;
 import sonia.scm.repository.RepositoryManager;
@@ -551,7 +551,7 @@ public class RepositoryImportResource
       repository = new Repository(null, type, name);
       manager.create(repository);
     }
-    catch (RepositoryAllreadyExistExeption ex)
+    catch (RepositoryAlreadyExistsException ex)
     {
       logger.warn("a {} repository with the name {} already exists", ex);
 
diff --git a/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java b/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
index 4ad97b60e9..94a40a09f3 100644
--- a/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
@@ -135,7 +135,7 @@ public class DefaultGroupManager extends AbstractGroupManager
     
     if (groupDAO.contains(name))
     {
-      throw new GroupAllreadyExistExeption(name.concat(" group already exists"));
+      throw new GroupAlreadyExistsException(name.concat(" group already exists"));
     }
 
     removeDuplicateMembers(group);
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
index daee5f42b3..b47508b33d 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -171,7 +171,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
 
     if (repositoryDAO.contains(repository))
     {
-      throw new RepositoryAllreadyExistExeption();
+      throw new RepositoryAlreadyExistsException();
     }
 
     repository.setId(keyGenerator.createKey());
diff --git a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
index 48ea159c83..79d34a14d9 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
@@ -159,7 +159,7 @@ public class DefaultUserManager extends AbstractUserManager
 
     if (userDAO.contains(user.getName()))
     {
-      throw new UserAllreadyExistException(user.getName());
+      throw new UserAlreadyExistsException(user.getName());
     }
 
     AssertUtil.assertIsValid(user);