diff --git a/scm-core/src/main/java/sonia/scm/plugin/ScmModule.java b/scm-core/src/main/java/sonia/scm/plugin/ScmModule.java
index 2e4472c50d..eacd259ff1 100644
--- a/scm-core/src/main/java/sonia/scm/plugin/ScmModule.java
+++ b/scm-core/src/main/java/sonia/scm/plugin/ScmModule.java
@@ -100,9 +100,9 @@ public class ScmModule
    *
    * @return
    */
-  public Iterable<Class<?>> getJaxrsProviders()
+  public Iterable<Class<?>> getRestProviders()
   {
-    return unwrap(jaxrsProviders);
+    return unwrap(restProviders);
   }
 
   /**
@@ -111,9 +111,9 @@ public class ScmModule
    *
    * @return
    */
-  public Iterable<Class<?>> getJaxrsResources()
+  public Iterable<Class<?>> getRestResources()
   {
-    return unwrap(jaxrsResources);
+    return unwrap(restResources);
   }
 
   /**
@@ -217,12 +217,12 @@ public class ScmModule
   private Set<ClassElement> extensions;
 
   /** Field description */
-  @XmlElement(name = "jaxrs-provider")
-  private Set<ClassElement> jaxrsProviders;
+  @XmlElement(name = "rest-provider")
+  private Set<ClassElement> restProviders;
 
   /** Field description */
-  @XmlElement(name = "jaxrs-resource")
-  private Set<ClassElement> jaxrsResources;
+  @XmlElement(name = "rest-resource")
+  private Set<ClassElement> restResources;
 
   /** Field description */
   @XmlElement(name = "subscriber")
diff --git a/scm-core/src/test/java/sonia/scm/plugin/ScmModuleTest.java b/scm-core/src/test/java/sonia/scm/plugin/ScmModuleTest.java
index fa9f6329fe..807f63da55 100644
--- a/scm-core/src/test/java/sonia/scm/plugin/ScmModuleTest.java
+++ b/scm-core/src/test/java/sonia/scm/plugin/ScmModuleTest.java
@@ -97,14 +97,14 @@ public class ScmModuleTest
       )
     );
     assertThat(
-      module.getJaxrsProviders(), 
+      module.getRestProviders(), 
       containsInAnyOrder(
         (Class<?>) Integer.class,
         (Class<?>) Long.class
       )
     );
     assertThat(
-      module.getJaxrsResources(), 
+      module.getRestResources(), 
       containsInAnyOrder(
         (Class<?>) Float.class,
         (Class<?>) Double.class
diff --git a/scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java b/scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
index 95f3a0f43c..595009d104 100644
--- a/scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
+++ b/scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
@@ -121,8 +121,8 @@ public final class ScmAnnotationProcessor extends AbstractProcessor
 
   /** Field description */
   private static final Set<ClassAnnotation> CLASS_ANNOTATIONS =
-    ImmutableSet.of(new ClassAnnotation("jaxrs-resource", Path.class),
-      new ClassAnnotation("jaxrs-provider", Provider.class));
+    ImmutableSet.of(new ClassAnnotation("rest-resource", Path.class),
+      new ClassAnnotation("rest-provider", Provider.class));
 
   //~--- methods --------------------------------------------------------------
 
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
index 4f79162558..0e55355d0b 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
@@ -218,8 +218,8 @@ public class DefaultPluginLoader implements PluginLoader
         }
       }
 
-      Iterables.addAll(extensions, mod.getJaxrsProviders());
-      Iterables.addAll(extensions, mod.getJaxrsResources());
+      Iterables.addAll(extensions, mod.getRestProviders());
+      Iterables.addAll(extensions, mod.getRestResources());
     }
   }