diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml
index 1705a1fc..d1773a57 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml
@@ -89,7 +89,7 @@
     <component>
       <role>org.apache.archiva.redback.keys.KeyManager</role>
       <role-hint>cached</role-hint>
-      <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
+      <implementation>org.apache.archiva.redback.keys.cached.CachedKeyManager</implementation>
       <description>CachedKeyManager</description>
       <requirements>
         <requirement>
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml
index 1705a1fc..d1773a57 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml
@@ -89,7 +89,7 @@
     <component>
       <role>org.apache.archiva.redback.keys.KeyManager</role>
       <role-hint>cached</role-hint>
-      <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
+      <implementation>org.apache.archiva.redback.keys.cached.CachedKeyManager</implementation>
       <description>CachedKeyManager</description>
       <requirements>
         <requirement>
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
index aa9e4614..fac9a773 100755
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
@@ -117,14 +117,14 @@
     </component>
   -->
 
-  <bean name="keyManager#cached" class="org.codehaus.plexus.redback.keys.cached.CachedKeyManager">
+  <bean name="keyManager#cached" class="org.apache.archiva.redback.keys.cached.CachedKeyManager">
     <property name="keyImpl" ref="keyManager#memory"/>
   </bean>
   <!--
     <component>
       <role>org.apache.archiva.redback.keys.KeyManager</role>
       <role-hint>cached</role-hint>
-      <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
+      <implementation>org.apache.archiva.redback.keys.cached.CachedKeyManager</implementation>
       <description>CachedKeyManager</description>
       <requirements>
         <requirement>
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
similarity index 98%
rename from redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java
rename to redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
index 7c1ea5c9..bf81a5ba 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys.cached;
+package org.apache.archiva.redback.keys.cached;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
index aa017cf5..cb8c29f6 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
@@ -29,7 +29,7 @@
 
   <context:annotation-config />
   <context:component-scan 
-    base-package="org.codehaus.plexus.redback.keys.cached"/>
+    base-package="org.apache.archiva.redback.keys.cached"/>
 
   <bean name="cache#keys" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
       init-method="initialize">
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java
similarity index 93%
rename from redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java
rename to redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java
index aaea8628..90dca43e 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys.cached;
+package org.apache.archiva.redback.keys.cached;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@
 
 import net.sf.ehcache.CacheManager;
 import org.apache.archiva.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.cached.CachedKeyManager;
 import org.codehaus.plexus.redback.keys.KeyManagerTestCase;
 import org.junit.Before;