Some renaming to make it clear that OSGI is being used