Fixing inconsistent names