[CHORE] Upgrading class names to use namespaces.