Class name conflict resolution