Rename class
Namespacing