Removed smallhadroncollider namespace
Brought back uppercase naming