diff --git a/ccm-cms-types-address/.svnignore b/ccm-cms-types-oldaddress/.svnignore
similarity index 100%
rename from ccm-cms-types-address/.svnignore
rename to ccm-cms-types-oldaddress/.svnignore
diff --git a/ccm-cms-types-address/application.xml b/ccm-cms-types-oldaddress/application.xml
similarity index 88%
rename from ccm-cms-types-address/application.xml
rename to ccm-cms-types-oldaddress/application.xml
index 29979d282..a8d818f31 100755
--- a/ccm-cms-types-address/application.xml
+++ b/ccm-cms-types-oldaddress/application.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-cms-types-address"
+  name="ccm-cms-types-oldaddress"
   prettyName="Red Hat CCM Content Types"
   version="6.6.0"
   release="1"
@@ -19,6 +19,6 @@
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-    The Address Content Type for the Red Hat CCM CMS.
+    The old Address Content Type for the Red Hat CCM CMS.
   </ccm:description>
 </ccm:application>
diff --git a/ccm-cms-types-address/doc/iso-country.txt b/ccm-cms-types-oldaddress/doc/iso-country.txt
similarity index 100%
rename from ccm-cms-types-address/doc/iso-country.txt
rename to ccm-cms-types-oldaddress/doc/iso-country.txt
diff --git a/ccm-cms-types-address/doc/make-insert.pl b/ccm-cms-types-oldaddress/doc/make-insert.pl
similarity index 100%
rename from ccm-cms-types-address/doc/make-insert.pl
rename to ccm-cms-types-oldaddress/doc/make-insert.pl
diff --git a/ccm-cms-types-address/pdl/com/arsdigita/content-types/Address.pdl b/ccm-cms-types-oldaddress/pdl/com/arsdigita/content-types/Address.pdl
similarity index 100%
rename from ccm-cms-types-address/pdl/com/arsdigita/content-types/Address.pdl
rename to ccm-cms-types-oldaddress/pdl/com/arsdigita/content-types/Address.pdl
diff --git a/ccm-cms-types-address/sql/ccm-cms-types-address/default/insert-iso-countries.sql b/ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/default/insert-iso-countries.sql
similarity index 100%
rename from ccm-cms-types-address/sql/ccm-cms-types-address/default/insert-iso-countries.sql
rename to ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/default/insert-iso-countries.sql
diff --git a/ccm-cms-types-address/sql/ccm-cms-types-address/default/upgrade/address-upgrade-1.sql b/ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/default/upgrade/address-upgrade-1.sql
similarity index 100%
rename from ccm-cms-types-address/sql/ccm-cms-types-address/default/upgrade/address-upgrade-1.sql
rename to ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/default/upgrade/address-upgrade-1.sql
diff --git a/ccm-cms-types-address/sql/ccm-cms-types-address/oracle-se-create.sql b/ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/oracle-se-create.sql
similarity index 100%
rename from ccm-cms-types-address/sql/ccm-cms-types-address/oracle-se-create.sql
rename to ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/oracle-se-create.sql
diff --git a/ccm-cms-types-address/sql/ccm-cms-types-address/oracle-se/upgrade/address-upgrade-2.sql b/ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/oracle-se/upgrade/address-upgrade-2.sql
similarity index 100%
rename from ccm-cms-types-address/sql/ccm-cms-types-address/oracle-se/upgrade/address-upgrade-2.sql
rename to ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/oracle-se/upgrade/address-upgrade-2.sql
diff --git a/ccm-cms-types-address/sql/ccm-cms-types-address/postgres-create.sql b/ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/postgres-create.sql
similarity index 100%
rename from ccm-cms-types-address/sql/ccm-cms-types-address/postgres-create.sql
rename to ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/postgres-create.sql
diff --git a/ccm-cms-types-address/sql/ccm-cms-types-address/postgres/upgrade/address-upgrade-2.sql b/ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/postgres/upgrade/address-upgrade-2.sql
similarity index 100%
rename from ccm-cms-types-address/sql/ccm-cms-types-address/postgres/upgrade/address-upgrade-2.sql
rename to ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/postgres/upgrade/address-upgrade-2.sql
diff --git a/ccm-cms-types-address/sql/ccm-cms-types-address/upgrade/oracle-se-1.sql b/ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/upgrade/oracle-se-1.sql
similarity index 100%
rename from ccm-cms-types-address/sql/ccm-cms-types-address/upgrade/oracle-se-1.sql
rename to ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/upgrade/oracle-se-1.sql
diff --git a/ccm-cms-types-address/sql/ccm-cms-types-address/upgrade/oracle-se-2.sql b/ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/upgrade/oracle-se-2.sql
similarity index 100%
rename from ccm-cms-types-address/sql/ccm-cms-types-address/upgrade/oracle-se-2.sql
rename to ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/upgrade/oracle-se-2.sql
diff --git a/ccm-cms-types-address/sql/ccm-cms-types-address/upgrade/postgres-1.sql b/ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/upgrade/postgres-1.sql
similarity index 100%
rename from ccm-cms-types-address/sql/ccm-cms-types-address/upgrade/postgres-1.sql
rename to ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/upgrade/postgres-1.sql
diff --git a/ccm-cms-types-address/sql/ccm-cms-types-address/upgrade/postgres-2.sql b/ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/upgrade/postgres-2.sql
similarity index 100%
rename from ccm-cms-types-address/sql/ccm-cms-types-address/upgrade/postgres-2.sql
rename to ccm-cms-types-oldaddress/sql/ccm-cms-types-oldaddress/upgrade/postgres-2.sql
diff --git a/ccm-cms-types-address/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml b/ccm-cms-types-oldaddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml
similarity index 100%
rename from ccm-cms-types-address/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml
rename to ccm-cms-types-oldaddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml
diff --git a/ccm-cms-types-address/src/ccm-cms-types-address.config b/ccm-cms-types-oldaddress/src/ccm-cms-types-oldaddress.config
similarity index 100%
rename from ccm-cms-types-address/src/ccm-cms-types-address.config
rename to ccm-cms-types-oldaddress/src/ccm-cms-types-oldaddress.config
diff --git a/ccm-cms-types-address/src/ccm-cms-types-address.load b/ccm-cms-types-oldaddress/src/ccm-cms-types-oldaddress.load
similarity index 89%
rename from ccm-cms-types-address/src/ccm-cms-types-address.load
rename to ccm-cms-types-oldaddress/src/ccm-cms-types-oldaddress.load
index 95c7208a3..c693057a4 100755
--- a/ccm-cms-types-address/src/ccm-cms-types-address.load
+++ b/ccm-cms-types-oldaddress/src/ccm-cms-types-oldaddress.load
@@ -10,7 +10,7 @@
     <initializer class="com.arsdigita.cms.contenttypes.AddressInitializer"/>
   </provides>
   <scripts>
-    <schema directory="ccm-cms-types-address"/>
+    <schema directory="ccm-cms-types-oldaddress"/>
     <data class="com.arsdigita.cms.contenttypes.AddressLoader"/>
   </scripts>
 </load>
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/Address.java b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/Address.java
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/Address.java
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/Address.java
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressConfig.java b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressConfig.java
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressConfig.java
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressConfig.java
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressConfig_parameter.properties b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressConfig_parameter.properties
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressConfig_parameter.properties
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressConfig_parameter.properties
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressInitializer.java
similarity index 98%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressInitializer.java
index ead7bbaa4..f225dcb28 100755
--- a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java
+++ b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressInitializer.java
@@ -39,7 +39,7 @@ public class AddressInitializer extends ContentTypeInitializer {
      * Constructor
      */
     public AddressInitializer() {
-        super("ccm-cms-types-address.pdl.mf",
+        super("ccm-cms-types-oldaddress.pdl.mf",
               Address.BASE_DATA_OBJECT_TYPE);
     }
 
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressLoader.java b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressLoader.java
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressLoader.java
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressLoader.java
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressResources.properties b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressResources.properties
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressResources.properties
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressResources.properties
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressResources_de.properties b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressResources_de.properties
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressResources_de.properties
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/AddressResources_de.properties
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/IsoCountry.java b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/IsoCountry.java
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/IsoCountry.java
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/IsoCountry.java
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/util/AddressGlobalizationUtil.java b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/util/AddressGlobalizationUtil.java
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/util/AddressGlobalizationUtil.java
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/util/AddressGlobalizationUtil.java
diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/util/AddressResourceBundle.java b/ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/util/AddressResourceBundle.java
similarity index 100%
rename from ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/util/AddressResourceBundle.java
rename to ccm-cms-types-oldaddress/src/com/arsdigita/cms/contenttypes/util/AddressResourceBundle.java
diff --git a/ccm-cms-types-address/web/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl b/ccm-cms-types-oldaddress/web/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl
similarity index 100%
rename from ccm-cms-types-address/web/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl
rename to ccm-cms-types-oldaddress/web/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl