Chnaged naming convention for main class