Fix inconsistent naming