Change to use namespaces instead of class prefix