bugzid:8164 removed fully qualified namespaces, and removed camelCase