diff --git a/config/alfresco/office-addin-context.xml b/config/alfresco/office-addin-context.xml
index 09307a7b9..bee3849bc 100644
--- a/config/alfresco/office-addin-context.xml
+++ b/config/alfresco/office-addin-context.xml
@@ -5,7 +5,7 @@
 
    <!-- I18N -->
    
-   <bean id="officeResourceBundles" class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
+   <bean id="officeResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
         <property name="resourceBundles">
             <list>
                 <value>alfresco.messages.office-addin</value>
@@ -13,4 +13,4 @@
         </property>
    </bean>
 
-</beans>
+</beans>
\ No newline at end of file
diff --git a/config/alfresco/portlets-context.xml b/config/alfresco/portlets-context.xml
index ad41ba437..fc7255ecf 100755
--- a/config/alfresco/portlets-context.xml
+++ b/config/alfresco/portlets-context.xml
@@ -5,7 +5,7 @@
 
    <!-- I18N -->
    
-   <bean id="portletsResourceBundles" class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
+   <bean id="portletsResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
         <property name="resourceBundles">
             <list>
                 <value>alfresco.messages.portlets</value>
diff --git a/config/alfresco/web-client-application-context.xml b/config/alfresco/web-client-application-context.xml
index 72e043990..93baa5784 100644
--- a/config/alfresco/web-client-application-context.xml
+++ b/config/alfresco/web-client-application-context.xml
@@ -95,7 +95,7 @@
       <property name="repoXMLConfigService" ref="webClientConfigService"/>
    </bean>
    
-   <bean id="webClientConfigAdminInterpreterHelp" class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent"> 
+   <bean id="webClientConfigAdminInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
       <property name="resourceBundles">
          <list>
              <value>alfresco.messages.webclient-config-admin-interpreter-help</value>