Fixed naming inconsistencies.