Removed extra namespaces, renamed method