diff --git a/debugger/src/ritz/jpda/jdi.clj b/debugger/src/ritz/jpda/jdi.clj
index f149eec..2602fc5 100644
--- a/debugger/src/ritz/jpda/jdi.clj
+++ b/debugger/src/ritz/jpda/jdi.clj
@@ -431,7 +431,7 @@
   "Return a regular expression pattern for matching all classes in the
    given namespace name"
   [ns]
-  (re-pattern (str (string/replace ns "-" "_") "\\$")))
+  (re-pattern (string/replace ns "-" "_")))
 
 (defn namespace-classes
   "Return all classes for the given namespace"
diff --git a/swank/elisp/slime-ritz.el b/swank/elisp/slime-ritz.el
index 948fd00..d5d28df 100644
--- a/swank/elisp/slime-ritz.el
+++ b/swank/elisp/slime-ritz.el
@@ -30,13 +30,13 @@ With prefix argument FLAG, do not break on exception"
   (interactive)
   (slime-eval-with-transcript
    `(swank:line-breakpoint
-     ,(slime-current-package) ,(buffer-name) ,(line-number-at-pos))))
+     ,(slime-current-package) ,(buffer-file-name) ,(line-number-at-pos))))
 
 (defun slime-java-line-breakpoint ()
   "Set a breakpoint at the current line in java"
   (interactive)
   (slime-eval-with-transcript
-   `(swank:line-breakpoint nil ,(buffer-name) ,(line-number-at-pos))))
+   `(swank:line-breakpoint nil ,(buffer-file-name) ,(line-number-at-pos))))
 
 ;;;; Breakpoints
 (defvar slime-breakpoints-buffer-name (slime-buffer-name :breakpoints))