Addressing inconsistent naming