Changed naming of Class and OSGi Properties