Fix entries that have different name