Fix inconsistent naming.