reverting back to using non namespaced classes