Fixing extension class name & services.xml formatting