Renamed classes to Normal

Room for future super classes to be made to reduce code duplication.