[CHORE] Fixing some class names that need to use namespaces.