diff --git a/scrplugin-annotations/LICENSE b/scr-annotations/LICENSE
similarity index 100%
rename from scrplugin-annotations/LICENSE
rename to scr-annotations/LICENSE
diff --git a/scrplugin-annotations/NOTICE b/scr-annotations/NOTICE
similarity index 100%
rename from scrplugin-annotations/NOTICE
rename to scr-annotations/NOTICE
diff --git a/scrplugin-annotations/pom.xml b/scr-annotations/pom.xml
similarity index 100%
rename from scrplugin-annotations/pom.xml
rename to scr-annotations/pom.xml
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/AutoDetect.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/AutoDetect.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/AutoDetect.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/AutoDetect.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferencePolicy.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferencePolicy.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferencePolicy.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferencePolicy.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java
diff --git a/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/package-info.java b/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/package-info.java
similarity index 100%
rename from scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/package-info.java
rename to scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/package-info.java