fix inconsistent naming convention