This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749489 13f79535-47bb-0310-9956-ffa450edef68