Fixed name inconsistencies.