Renaming a class to what it actually is. This should be amended to one of the older commit prior to merge-to-master