diff --git a/pkgs/racket-test-core/tests/racket/module.rktl b/pkgs/racket-test-core/tests/racket/module.rktl
index db8639f31a..e1ce790faf 100644
--- a/pkgs/racket-test-core/tests/racket/module.rktl
+++ b/pkgs/racket-test-core/tests/racket/module.rktl
@@ -3169,6 +3169,32 @@ case of module-leve bindings; it doesn't cover local bindings.
                   exn:fail:contract:arity?
                   #rx"define-values: result arity mismatch")
 
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Make sure source-name tracking works across multiple definitions
+
+(module tries-to-use-first-defined-function-too-early racket/base
+  (define-syntax-rule (go)
+    (begin
+      (f 1)
+      (define (f x) x)
+      (define (g y) y)))
+  (go))
+
+(err/rt-test/once (dynamic-require ''tries-to-use-first-defined-function-too-early #f)
+                  exn:fail:contract:variable?
+                  #rx"^f:")
+
+(module tries-to-use-second-defined-function-too-early racket/base
+  (define-syntax-rule (go)
+    (begin
+      (f 1)
+      (define (g y) y)
+      (define (f x) x)))
+  (go))
+
+(err/rt-test/once (dynamic-require ''tries-to-use-second-defined-function-too-early #f)
+                  exn:fail:contract:variable?
+                  #rx"^f:")
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
diff --git a/racket/src/cs/linklet.sls b/racket/src/cs/linklet.sls
index d83944b309..82f0cd1961 100644
--- a/racket/src/cs/linklet.sls
+++ b/racket/src/cs/linklet.sls
@@ -857,6 +857,17 @@
          [else ""]))]
      [else ""]))
 
+  (define (indentify-internal-name var)
+    (cond
+     [(error-print-source-location)
+      (cond
+       [(eq? (variable-name var) (variable-source-name var))
+        ""]
+       [else
+        (string-append "\n  internal name: "
+                       (symbol->string  (variable-name var)))])]
+     [else ""]))
+
   (define (raise-undefined var set?)
     (raise
      (|#%app|
@@ -866,11 +877,13 @@
         (string-append "set!: assignment disallowed;\n"
                        " cannot set variable before its definition\n"
                        "  variable: " (symbol->string (variable-source-name var))
-                       (identify-module var))]
+                       (identify-module var)
+                       (indentify-internal-name var))]
        [else
         (string-append (symbol->string (variable-source-name var))
                        ": undefined;\n cannot reference an identifier before its definition"
-                       (identify-module var))])
+                       (identify-module var)
+                       (indentify-internal-name var))])
       (current-continuation-marks)
       (variable-name var))))
 
diff --git a/racket/src/schemify/source-sym.rkt b/racket/src/schemify/source-sym.rkt
index c65830e9e9..848b3fdca0 100644
--- a/racket/src/schemify/source-sym.rkt
+++ b/racket/src/schemify/source-sym.rkt
@@ -8,7 +8,7 @@
   (for/fold ([src-syms #hasheq()]) ([body (in-list bodys)])
     (match body
       [`(define-values ,ids ,rhs)
-       (for/fold ([src-syms #hasheq()]) ([id (in-list ids)])
+       (for/fold ([src-syms src-syms]) ([id (in-list ids)])
          (define u-id (unwrap id))
          (define sym (or (wrap-property id 'source-name) u-id))
          (cond