debugging more name inconsistencies