diff --git a/scm-core/src/main/java/sonia/scm/repository/NamespaceStrategy.java b/scm-core/src/main/java/sonia/scm/repository/NamespaceStrategy.java
index 48b3cd09b6..4548d2b82b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/NamespaceStrategy.java
+++ b/scm-core/src/main/java/sonia/scm/repository/NamespaceStrategy.java
@@ -45,5 +45,7 @@ public interface NamespaceStrategy {
    *
    * @return namespace can be changed
    */
-  boolean canBeChanged();
+  default boolean canBeChanged() {
+    return false;
+  }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/CurrentYearNamespaceStrategy.java b/scm-webapp/src/main/java/sonia/scm/repository/CurrentYearNamespaceStrategy.java
index 3a23b390fe..ef398c291c 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/CurrentYearNamespaceStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/CurrentYearNamespaceStrategy.java
@@ -50,9 +50,4 @@ public class CurrentYearNamespaceStrategy implements NamespaceStrategy {
   public String createNamespace(Repository repository) {
     return String.valueOf(Year.now(clock).getValue());
   }
-
-  @Override
-  public boolean canBeChanged() {
-    return false;
-  }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/RepositoryTypeNamespaceStrategy.java b/scm-webapp/src/main/java/sonia/scm/repository/RepositoryTypeNamespaceStrategy.java
index 958e51892d..d378bc7354 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/RepositoryTypeNamespaceStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/RepositoryTypeNamespaceStrategy.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
+    
 package sonia.scm.repository;
 
 import sonia.scm.plugin.Extension;
@@ -32,9 +32,4 @@ public class RepositoryTypeNamespaceStrategy implements NamespaceStrategy {
   public String createNamespace(Repository repository) {
     return repository.getType();
   }
-
-  @Override
-  public boolean canBeChanged() {
-    return false;
-  }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/UsernameNamespaceStrategy.java b/scm-webapp/src/main/java/sonia/scm/repository/UsernameNamespaceStrategy.java
index d4e4742305..9b6cfd21c5 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/UsernameNamespaceStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/UsernameNamespaceStrategy.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
+    
 package sonia.scm.repository;
 
 import org.apache.shiro.SecurityUtils;
@@ -34,9 +34,4 @@ public class UsernameNamespaceStrategy implements NamespaceStrategy {
   public String createNamespace(Repository repository) {
     return SecurityUtils.getSubject().getPrincipal().toString();
   }
-
-  @Override
-  public boolean canBeChanged() {
-    return false;
-  }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/NamespaceStrategyResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/NamespaceStrategyResourceTest.java
index 656dd225cd..9beddd5ff3 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/NamespaceStrategyResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/NamespaceStrategyResourceTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
+    
 package sonia.scm.api.v2.resources;
 
 import com.google.common.collect.Lists;
@@ -68,7 +68,7 @@ class NamespaceStrategyResourceTest {
   }
 
   private Set<NamespaceStrategy> allStrategies() {
-    return strategies(new AwesomeNamespaceStrategy(), new SuperNamespaceStrategy(), new MegaNamespaceStrategy());
+    return  strategies(new AwesomeNamespaceStrategy(), new SuperNamespaceStrategy(), new MegaNamespaceStrategy());
   }
 
   private Set<NamespaceStrategy> strategies(NamespaceStrategy... strategies) {
@@ -80,11 +80,6 @@ class NamespaceStrategyResourceTest {
     public String createNamespace(Repository repository) {
       return "awesome";
     }
-
-    @Override
-    public boolean canBeChanged() {
-      return false;
-    }
   }
 
   private static class SuperNamespaceStrategy implements NamespaceStrategy {
@@ -92,11 +87,6 @@ class NamespaceStrategyResourceTest {
     public String createNamespace(Repository repository) {
       return "super";
     }
-
-    @Override
-    public boolean canBeChanged() {
-      return false;
-    }
   }
 
   private static class MegaNamespaceStrategy implements NamespaceStrategy {
@@ -104,10 +94,5 @@ class NamespaceStrategyResourceTest {
     public String createNamespace(Repository repository) {
       return "mega";
     }
-
-    @Override
-    public boolean canBeChanged() {
-      return false;
-    }
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyProviderTest.java b/scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyProviderTest.java
index da6bc1c908..7f518254c4 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyProviderTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyProviderTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
+    
 package sonia.scm.repository;
 
 import org.junit.jupiter.api.Test;
@@ -66,17 +66,12 @@ class NamespaceStrategyProviderTest {
     return new LinkedHashSet<>(Arrays.asList(new Trillian(), new Zaphod(), new Arthur()));
   }
 
-  private static class Trillian implements NamespaceStrategy {
+  private static class Trillian implements NamespaceStrategy{
 
     @Override
     public String createNamespace(Repository repository) {
       return "trillian";
     }
-
-    @Override
-    public boolean canBeChanged() {
-      return false;
-    }
   }
 
   private static class Zaphod implements NamespaceStrategy {
@@ -85,11 +80,6 @@ class NamespaceStrategyProviderTest {
     public String createNamespace(Repository repository) {
       return "zaphod";
     }
-
-    @Override
-    public boolean canBeChanged() {
-      return false;
-    }
   }
 
   private static class Arthur implements NamespaceStrategy {
@@ -98,11 +88,6 @@ class NamespaceStrategyProviderTest {
     public String createNamespace(Repository repository) {
       return "arthur";
     }
-
-    @Override
-    public boolean canBeChanged() {
-      return false;
-    }
   }
 
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyValidatorTest.java b/scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyValidatorTest.java
index 7de644468e..9f2f5b7709 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyValidatorTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyValidatorTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
+    
 package sonia.scm.repository;
 
 import com.google.common.collect.Sets;
@@ -30,7 +30,7 @@ import sonia.scm.ScmConstraintViolationException;
 
 import java.util.Collections;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 class NamespaceStrategyValidatorTest {
 
@@ -52,11 +52,6 @@ class NamespaceStrategyValidatorTest {
     public String createNamespace(Repository repository) {
       return null;
     }
-
-    @Override
-    public boolean canBeChanged() {
-      return false;
-    }
   }
 
 }