Refactor Master Class to CamelCase