diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java
index 6c97d30a94..a4083cef1d 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java
@@ -25,23 +25,17 @@
 package sonia.scm.repository.api;
 
 public enum MergeStrategy {
-  MERGE_COMMIT("merge commit", true),
-  FAST_FORWARD_IF_POSSIBLE("fast forward if possible", false),
-  SQUASH("squash", true),
-  REBASE("rebase", false);
+  MERGE_COMMIT(true),
+  FAST_FORWARD_IF_POSSIBLE(true),
+  SQUASH(true),
+  REBASE(false);
 
-  private final String name;
   private final boolean commitMessageAllowed;
 
-  MergeStrategy(String name, boolean commitMessageAllowed) {
-    this.name = name;
+  MergeStrategy(boolean commitMessageAllowed) {
     this.commitMessageAllowed = commitMessageAllowed;
   }
 
-  public String getName() {
-    return name;
-  }
-
   public boolean isCommitMessageAllowed() {
     return commitMessageAllowed;
   }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IndexDtoGeneratorTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IndexDtoGeneratorTest.java
index 97c9714513..94c78f798b 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IndexDtoGeneratorTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IndexDtoGeneratorTest.java
@@ -132,6 +132,7 @@ class IndexDtoGeneratorTest {
     when(resourceLinks.repositoryTypeCollection()).thenReturn(new ResourceLinks.RepositoryTypeCollectionLinks(scmPathInfo));
     when(resourceLinks.repositoryRoleCollection()).thenReturn(new ResourceLinks.RepositoryRoleCollectionLinks(scmPathInfo));
     when(resourceLinks.namespaceStrategies()).thenReturn(new ResourceLinks.NamespaceStrategiesLinks(scmPathInfo));
+    when(resourceLinks.namespaceCollection()).thenReturn(new ResourceLinks.NamespaceCollectionLinks(scmPathInfo));
     when(resourceLinks.me()).thenReturn(new ResourceLinks.MeLinks(scmPathInfo, new ResourceLinks.UserLinks(scmPathInfo)));
   }
 }