Fixed some inconsistencies in naming.