Completed converting classes to namespaced versions.