Fixed inconsistent naming