Rename namespace & classes