Fixed: name inconsistencies