diff --git a/beautiful-racket/br/demo/bf/bf-atsign-sexp.rkt b/beautiful-racket/br/demo/bf/atsign-sexp.rkt
similarity index 100%
rename from beautiful-racket/br/demo/bf/bf-atsign-sexp.rkt
rename to beautiful-racket/br/demo/bf/atsign-sexp.rkt
diff --git a/beautiful-racket/br/demo/bf/bf-atsign.rkt b/beautiful-racket/br/demo/bf/atsign.rkt
similarity index 100%
rename from beautiful-racket/br/demo/bf/bf-atsign.rkt
rename to beautiful-racket/br/demo/bf/atsign.rkt
diff --git a/beautiful-racket/br/demo/bf/bf-expander-imperative.rkt b/beautiful-racket/br/demo/bf/expander-imperative.rkt
similarity index 100%
rename from beautiful-racket/br/demo/bf/bf-expander-imperative.rkt
rename to beautiful-racket/br/demo/bf/expander-imperative.rkt
diff --git a/beautiful-racket/br/demo/bf/bf-expander.rkt b/beautiful-racket/br/demo/bf/expander.rkt
similarity index 100%
rename from beautiful-racket/br/demo/bf/bf-expander.rkt
rename to beautiful-racket/br/demo/bf/expander.rkt
diff --git a/beautiful-racket/br/demo/bf/bf-factorial.rkt b/beautiful-racket/br/demo/bf/factorial.rkt
similarity index 83%
rename from beautiful-racket/br/demo/bf/bf-factorial.rkt
rename to beautiful-racket/br/demo/bf/factorial.rkt
index f4973c8..e080560 100644
--- a/beautiful-racket/br/demo/bf/bf-factorial.rkt
+++ b/beautiful-racket/br/demo/bf/factorial.rkt
@@ -1,4 +1,4 @@
-#lang reader "bf-reader.rkt"
+#lang reader "reader.rkt"
 >++++++++++>>>+>+[>>>+[-[<<<<<[+<<<<<]>>[[-]>[<<+>+>-]
 <[>+<-]<[>+<-[>+<-[>+<-[>+<-[>+<-[>+<-[>+<-[>+<-[>+<-
 [>[-]>>>>+>+<<<<<<-[>+<-]]]]]]]]]]]>[<+>-]+>>>>>]<<<<<
diff --git a/beautiful-racket/br/demo/bf/bf-hello-world.rkt b/beautiful-racket/br/demo/bf/hello-world.rkt
similarity index 69%
rename from beautiful-racket/br/demo/bf/bf-hello-world.rkt
rename to beautiful-racket/br/demo/bf/hello-world.rkt
index 7ce18c1..d68f9ab 100644
--- a/beautiful-racket/br/demo/bf/bf-hello-world.rkt
+++ b/beautiful-racket/br/demo/bf/hello-world.rkt
@@ -1,4 +1,4 @@
-#lang reader "bf-reader.rkt"
+#lang reader "reader.rkt"
 ++++++[>++++++++++++<-]>.
 >++++++++++[>++++++++++<-]>+.
 +++++++..+++.>++++[>+++++++++++<-]>.
diff --git a/beautiful-racket/br/demo/bf/bf-parser.rkt b/beautiful-racket/br/demo/bf/parser.rkt
similarity index 100%
rename from beautiful-racket/br/demo/bf/bf-parser.rkt
rename to beautiful-racket/br/demo/bf/parser.rkt
diff --git a/beautiful-racket/br/demo/bf/bf-reader.rkt b/beautiful-racket/br/demo/bf/reader.rkt
similarity index 76%
rename from beautiful-racket/br/demo/bf/bf-reader.rkt
rename to beautiful-racket/br/demo/bf/reader.rkt
index 9910424..7fdc630 100644
--- a/beautiful-racket/br/demo/bf/bf-reader.rkt
+++ b/beautiful-racket/br/demo/bf/reader.rkt
@@ -1,14 +1,14 @@
 #lang br/quicklang
-(require "bf-parser.rkt")
+(require "parser.rkt")
 
 (define (read-syntax path port)
   (define parse-tree (parse path (tokenize port)))
-  (define module-datum `(module bf-mod br/demo/bf/bf-expander
+  (define module-datum `(module bf-mod br/demo/bf/expander
                           ,parse-tree))
   (datum->syntax #f module-datum))
 (provide read-syntax)
 
-(require parser-tools/lex brag/support)
+(require parser-tools/lex)
 (define (tokenize port)
   (define (next-token)
     (define our-lexer