Redefine some name convention and namespaces