cleanup
modified namespaces for new version of ODCS 1.1-SNAPSHOT