[Apache] Fixed namespaces