Cleaned up the naming nomenclature and controllers