repair struct with same #:name and #:constructor-name identifier

Closes #3791

pkgs/racket-test-core/tests/racket/struct.rktl

@@ -1610,6 +1610,13 @@
   (struct exn:foo exn () #:constructor-name make-exn:foo)
   (test "foo" exn-message (make-exn:foo "foo" (current-continuation-marks))))
 
+(let ()
+  (struct foo (x) #:constructor-name Foo #:name Foo)
+  (test #t foo? (Foo 1))
+  (test 1 foo-x (Foo 1))
+  (test #t foo? (let-syntax ([mk (lambda (stx)
+                                   #`(#,(cadr (extract-struct-info (syntax-local-value #'Foo))) 1))])
+                  (mk))))
 
 ;; ----------------------------------------
 

racket/collects/racket/private/define-struct.rkt

@@ -732,7 +732,7 @@
                                           (list
                                            (quote-syntax #,(prune struct:))
                                            (quote-syntax #,(prune (if (and ctor-name self-ctor?)
-                                                                      id
+                                                                      ctor-name
                                                                       make-)))
                                            (quote-syntax #,(prune ?))
                                            (list