Fix record name conflict