Fixing namespaces and aliases