Add a missing return statement
Rename namespace