diff --git a/bt5/erp5_forge/ExtensionTemplateItem/PythonScriptParserUtility.py b/bt5/erp5_forge/ExtensionTemplateItem/PythonScriptParserUtility.py
index 6a891a6e020ebe6ed6aed95eaefd4f1c1640fef7..bc84f7e7baa69f32f065f42dae8536d7d153c3e1 100644
--- a/bt5/erp5_forge/ExtensionTemplateItem/PythonScriptParserUtility.py
+++ b/bt5/erp5_forge/ExtensionTemplateItem/PythonScriptParserUtility.py
@@ -64,7 +64,7 @@ def findMessageListFromPythonInProduct(function_name_list):
   product_dir = os.path.dirname(Products.ERP5.__path__[0])
   erp5_product_list = ('CMFActivity', 'CMFCategory',
                        'ERP5', 'ERP5Banking', 'ERP5Catalog', 'ERP5Configurator',
-                       'ERP5Form', 'ERP5OOo', 'ERP5Security', 'ERP5Vcs',
+                       'ERP5Form', 'ERP5OOo', 'ERP5Security', 'ERP5VCS',
                        'ERP5SyncML', 'ERP5Type', 'ERP5Wizard', 'ERP5Workflow',
                        'HBTreeFolder2', 'MailTemplates', 'TimerService',
                        'ZMySQLDA', 'ZMySQLDDA', 'ZSQLCatalog',
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getRepositoryHistoryList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getRepositoryHistoryList.xml
index 5c681f3627ad60e1da5f4da5bf3370a5424d7791..468182d1c5e9c9c4f9b2890a544a8d88ffd00fd5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getRepositoryHistoryList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getRepositoryHistoryList.xml
@@ -52,7 +52,7 @@
             <key> <string>_body</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-from Products.ERP5Vcs.SubversionClient import SubversionSSLTrustError\n
+from Products.ERP5VCS.SubversionClient import SubversionSSLTrustError\n
 from Products.ERP5Type.Document import newTempBase\n
 \n
 portal = context.getPortalObject()\n
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnCheckout.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnCheckout.xml
index 75b773809a14ee8a245309bb2244cfc10cd31102..47fa1ca97743747a6d99926c7c7b739fe989a9d1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnCheckout.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnCheckout.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>from Products.ERP5Vcs.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
+            <value> <string>from Products.ERP5VCS.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
 \n
 vcs_tool = context.getVcsTool()\n
 try:\n
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsLogGlobal.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsLogGlobal.xml
index a2b19ef07e0d48f58d6d9026064ed7f69b56cb3a..fb58f3b9b8da0b1d120614fbfea759cd3f62f190 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsLogGlobal.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsLogGlobal.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>from Products.ERP5Vcs.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
+            <value> <string>from Products.ERP5VCS.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
 from Products.ERP5Type.Document import newTempBase\n
 \n
 # get selected business templates\n
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_getRepositoryURL.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_getRepositoryURL.xml
index 6a5c0727d64ffe2a2e7b8888119df476100c761d..9138a4b9288224f80327161b412c402f2814df43 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_getRepositoryURL.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_getRepositoryURL.xml
@@ -51,7 +51,7 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string># try to get the repository URL, else redirect to the dialog for creating a working copy in one of the configured repositories\n
-from Products.ERP5Vcs.WorkingCopy import NotAWorkingCopyError\n
+from Products.ERP5VCS.WorkingCopy import NotAWorkingCopyError\n
 try:\n
   return context.getVcsTool().getRemoteUrl()\n
 except NotAWorkingCopyError:\n
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.xml
index df23fec20d37f21d10813268c116ce50cdc65a54..f1d2d59bf555ccffd5982aba16fdcfc2ad783d5b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>from Products.ERP5Vcs.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
+            <value> <string>from Products.ERP5VCS.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
 \n
 try:\n
   raise exception\n
diff --git a/bt5/erp5_forge/bt/change_log b/bt5/erp5_forge/bt/change_log
index c7d1ea4da3341192ffad88b0a9b352798b4c5aa7..5fc514b1685995826b19a5e101e727ba62358327 100644
--- a/bt5/erp5_forge/bt/change_log
+++ b/bt5/erp5_forge/bt/change_log
@@ -173,7 +173,7 @@ Add external Method to see Security for arbitrary user
 * Now possible to filter files to commit from diff view
 
 2006-07-05 chris
-* ERP5Vcs now detects outdated files so that user know if he needs to update his working copy or not.
+* ERP5Subversion now detects outdated files so that user know if he needs to update his working copy or not.
 
 2006-06-26 chris
 * Update according to last XHTML style update
diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision
index 0905ea78aba8dbc76598cb3610907683a1cb4525..837f72e62aada6de3f28d3e73245f0f786b5418c 100644
--- a/bt5/erp5_forge/bt/revision
+++ b/bt5/erp5_forge/bt/revision
@@ -1 +1 @@
-642
\ No newline at end of file
+643
\ No newline at end of file
diff --git a/buildout/software-profiles/products-erp5.cfg b/buildout/software-profiles/products-erp5.cfg
index b0c47f5b3c16dfb48bc1d63bc0bd1e7d9b74088f..9bb75a37f47c4762c7d6c6af292c370c66b7b2da 100644
--- a/buildout/software-profiles/products-erp5.cfg
+++ b/buildout/software-profiles/products-erp5.cfg
@@ -24,6 +24,6 @@ svn_param =--trust-server-cert --non-interactive --quiet --revision ${versions:e
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 stop-on-error = true
 update-command = ${:command}
-product_list = ERP5Vcs
+product_list = ERP5VCS
 command =
   for product in ${:product_list} ; do ${subversion:location}/bin/svn checkout ${:svn_param} https://svn.erp5.org/repos/public/erp5/trunk/products/$product ${:location}/$product || exit 1 ; done
diff --git a/product/ERP5/Document/BusinessTemplate.py b/product/ERP5/Document/BusinessTemplate.py
index 32eacf15e4ade1ee5bd312ec754801174565fda7..4f53c57a792891e2701d3e384f250220a823acfc 100644
--- a/product/ERP5/Document/BusinessTemplate.py
+++ b/product/ERP5/Document/BusinessTemplate.py
@@ -5108,14 +5108,14 @@ Business Template is a set of definitions, such as skins, portal types and categ
 
     @transactional_cached(lambda self, vcs=None, path=None: (self, vcs, path))
     def getVcsTool(self, vcs=None, path=None):
-      from Products.ERP5Vcs.WorkingCopy import getVcsTool
+      from Products.ERP5VCS.WorkingCopy import getVcsTool
       if not (path or vcs):
         path = self.getExportPath()
       return getVcsTool(vcs=vcs, path=path).__of__(self)
 
     def isVcsType(self, *vcs):
       # could be moved to Products.ERP5.Base.Base
-      from Products.ERP5Vcs.WorkingCopy import NotAWorkingCopyError
+      from Products.ERP5VCS.WorkingCopy import NotAWorkingCopyError
       try:
         return self.getVcsTool().reference in vcs
       except NotAWorkingCopyError:
@@ -5243,7 +5243,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
     def diffObjectAsHTML(self, REQUEST, **kw):
       """
         Convert diff into a HTML format before reply
-        This is compatible with ERP5Vcs look and feel but
+        This is compatible with ERP5VCS look and feel but
         it is preferred in future we use more difflib python library.
       """
       return DiffFile(self.diffObject(REQUEST, **kw)).toHTML()
diff --git a/product/ERP5/Tool/TemplateTool.py b/product/ERP5/Tool/TemplateTool.py
index 92623e8acfe5d51a42b7473f2fcd0a53f082f3b0..6142243b0b0b7f320f463efd3446b16d47cef61f 100644
--- a/product/ERP5/Tool/TemplateTool.py
+++ b/product/ERP5/Tool/TemplateTool.py
@@ -674,7 +674,7 @@ class TemplateTool (BaseTool):
     def diffObjectAsHTML(self, REQUEST, **kw):
       """
         Convert diff into a HTML format before reply
-        This is compatible with ERP5Vcs look and feel but
+        This is compatible with ERP5VCS look and feel but
         it is preferred in future we use more difflib python library.
       """
       return DiffFile(self.diffObject(REQUEST, **kw)).toHTML()
diff --git a/product/ERP5/utils/svn_update.sh b/product/ERP5/utils/svn_update.sh
index 7b67fef781896c91df2eee54fc7c9d9f1110c624..312df1241225e6195df7fa2d520d10b53613640f 100755
--- a/product/ERP5/utils/svn_update.sh
+++ b/product/ERP5/utils/svn_update.sh
@@ -4,7 +4,7 @@ echo -e "\033[0;31mThis is an unsupported script. You should use 'svn update' co
 
 # Modules to get from the SVN
 PRODUCTS="CMFActivity CMFCategory ERP5 ERP5Banking ERP5Catalog \
-          ERP5Form ERP5OOo ERP5Security ERP5Vcs ERP5SyncML \
+          ERP5Form ERP5OOo ERP5Security ERP5VCS ERP5SyncML \
           ERP5Type TimerService ZMySQLDDA ZSQLCatalog"
 
 # System user and group that own Zope product files
diff --git a/product/ERP5Type/DiffUtils.py b/product/ERP5Type/DiffUtils.py
index 776c7874887518fa4179258f795c77839e639d1c..18033bbd86ded6cb168eacdb2686fe5b1a319c06 100644
--- a/product/ERP5Type/DiffUtils.py
+++ b/product/ERP5Type/DiffUtils.py
@@ -31,7 +31,7 @@
  Provide a feature not present into difflib, which is generate a colored diff
  from a diff file/string.
 
- This code is original form ERP5Vcs and was moved to here for be used in
+ This code is original form ERP5VCS and was moved to here for be used in
  general ERP5. 
 
  XXX The organisation of DiffUtils should be reviewed and reorganised in a tool
diff --git a/product/ERP5VCS/Git.py b/product/ERP5VCS/Git.py
index 60aef46b9fe9c689a47e004da7b54f7bc11eb8bb..b649123b9852096f5601345222652055d8af7cb1 100644
--- a/product/ERP5VCS/Git.py
+++ b/product/ERP5VCS/Git.py
@@ -32,7 +32,7 @@ from Acquisition import aq_base
 from DateTime import DateTime
 from Products.ERP5Type.Message import translateString
 from ZTUtils import make_query
-from Products.ERP5Vcs.WorkingCopy import \
+from Products.ERP5VCS.WorkingCopy import \
   WorkingCopy, NotAWorkingCopyError, Dir, File, selfcached
 
 class GitError(EnvironmentError):
diff --git a/product/ERP5VCS/README.txt b/product/ERP5VCS/README.txt
index 7fe4cda5865587df476cbbf168b4820bf0d3acc1..5737ebc210f8fb18c7b6326f5e0527a0453ebaae 100644
--- a/product/ERP5VCS/README.txt
+++ b/product/ERP5VCS/README.txt
@@ -1,6 +1,6 @@
-ERP5Vcs
+ERP5VCS
 
-  ERP5Vcs provides a Subversion interface. This product
+  ERP5VCS provides a Subversion interface. This product
   depends on "pysvn":http://pysvn.tigris.org/.
 
   To use this product, you must make a directory named 'svn' under
diff --git a/product/ERP5VCS/Subversion.py b/product/ERP5VCS/Subversion.py
index 05e7e560197c4777d4abda8b70c30ce3764b85e5..0c32bda19c68353cf2618e42099ad2ad9795acb2 100644
--- a/product/ERP5VCS/Subversion.py
+++ b/product/ERP5VCS/Subversion.py
@@ -35,10 +35,10 @@ from DateTime import DateTime
 from ZTUtils import make_query
 from Products.ERP5Type.Message import translateString
 from Products.ERP5.Document.BusinessTemplate import BusinessTemplateFolder
-from Products.ERP5Vcs.WorkingCopy import \
+from Products.ERP5VCS.WorkingCopy import \
   WorkingCopy, Dir, File, chdir_working_copy, selfcached, \
   NotAWorkingCopyError, VcsConflictError
-from Products.ERP5Vcs.SubversionClient import \
+from Products.ERP5VCS.SubversionClient import \
   newSubversionClient, SubversionLoginError, SubversionSSLTrustError
 
 
diff --git a/product/ERP5VCS/VERSION.txt b/product/ERP5VCS/VERSION.txt
index 6180b8d3fae8d10f80d08a0a44725caa188d5608..57d7452a34fb36932c77b0be4041db0b749ed942 100644
--- a/product/ERP5VCS/VERSION.txt
+++ b/product/ERP5VCS/VERSION.txt
@@ -1 +1 @@
-ERP5Vcs 5.4.7
+ERP5VCS 5.4.7
diff --git a/product/ERP5VCS/__init__.py b/product/ERP5VCS/__init__.py
index 586779eabeef299ad00021ec3f3a424b938ec730..8e942f3232c772bd916956143743ab6dad76741e 100644
--- a/product/ERP5VCS/__init__.py
+++ b/product/ERP5VCS/__init__.py
@@ -53,5 +53,5 @@ def initialize( context ):
                          content_classes = content_classes)
 
 # Register Subversion before Git
-from Products.ERP5Vcs.Subversion import Subversion
-from Products.ERP5Vcs.Git import Git
+from Products.ERP5VCS.Subversion import Subversion
+from Products.ERP5VCS.Git import Git
diff --git a/tests/__init__.py b/tests/__init__.py
index e9929f13b116233a24ff3861719abdfe9f942b2d..96e920112af004adef5196910a233060eeeb7638 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -7,7 +7,7 @@ class _ERP5(ERP5TypeTestSuite):
   enabled_product_list = ('CMFActivity', 'CMFCategory', 'ERP5', 'ERP5Catalog',
                           'ERP5eGovSecurity', 'ERP5Form', 'ERP5Legacy',
                           'ERP5OOo', 'ERP5Security', 'ERP5SyncML', 'ERP5Type',
-                          'ERP5Vcs', 'ERP5Wizard', 'Formulator', 'ERP5Workflow',
+                          'ERP5VCS', 'ERP5Wizard', 'Formulator', 'ERP5Workflow',
                           'ERP5Configurator','HBTreeFolder2', 'MailTemplates', 
                           'PortalTransforms', 'TimerService', 'ZLDAPConnection', 
                           'ZLDAPMethods', 'ZMySQLDA', 'ZMySQLDDA', 'ZSQLCatalog')