Update namespaces, remove alias for ClassGenerator