Resolving name inconsistency