Updated symbolic names, updated osgi-inf to refer to rafactored service
locations