Fixed inconsistencies in naming scheme