Corrected namespaces and method/argument names