* Some class namespaces are changed