namespace and classes renaming