Fixing name inconsistencies