Rename namespace and remove unused dependencies