Fix inconsistent naming convention