Fixed a few major inconsistencies in naming.