fixed more class namespaces