Removed "View" and "Orchestrator" from class names