Modified module names

Modified osgi module name to adhere to a naming convention that
highlight the deployment model of the various modules.