diff --git a/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/activities-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/activities-insert-SqlMap.xml
index 1f5df90e4f..ea26c0b9bf 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/activities-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/activities-insert-SqlMap.xml
@@ -4,7 +4,7 @@
     PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"      
     "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
-<sqlMap namespace="activities">
+<sqlMap namespace="alfresco.activities">
 
    <insert id="insert.activity.feedcontrol" parameterClass="FeedControl">
       insert into alf_activity_feed_control (id, feed_user_id, site_network, app_tool, last_modified)
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
index 5e0a2488a1..15dae01e7e 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
@@ -4,7 +4,7 @@
     PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"      
     "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
-<sqlMap namespace="activities">
+<sqlMap namespace="alfresco.activities">
 
    <typeAlias alias="ActivityFeed" type="org.alfresco.repo.activities.feed.ActivityFeedDAO"/>
    <typeAlias alias="FeedControl" type="org.alfresco.repo.activities.feed.control.FeedControlDAO"/>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml
index 2867e05f20..0b0223b314 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml
@@ -4,7 +4,7 @@
     PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"      
     "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
-<sqlMap namespace="activities">
+<sqlMap namespace="alfresco.activities">
 
    <insert id="insert.activity.feedcontrol" parameterClass="FeedControl">