Fixing namespaces and class calls