Fix inconsistent names