Fix collisions with class and namespace.