fixed name inconsistencies