Fixed inconsistent naming scheme