Renames the classes to reflect the namespace