diff --git a/Makefile b/Makefile
index 5c09f57b6ae8ad7c833d3c457bd47594334e4f45..574460b1e61865c304c26fb51fd9b81addad59dd 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 TOP = XSTop
 SIM_TOP   = SimTop
 FPGATOP = top.TopMain
-BUILD_DIR = ./build
+BUILD_DIR ?= ./build
 TOP_V = $(BUILD_DIR)/$(TOP).v
 SCALA_FILE = $(shell find ./src/main/scala -name '*.scala')
 TEST_FILE = $(shell find ./src/test/scala -name '*.scala')
@@ -92,7 +92,12 @@ ifeq ($(MFC),1)
 	--lowering-options=noAlwaysComb,disallowExpressionInliningInPorts,explicitBitcast \
 	--verilog --dedup -o $(TOP_V) $(BUILD_DIR)/$(TOP).chirrtl.fir
 endif
-	sed -i -e 's/_\(aw\|ar\|w\|r\|b\)_\(\|bits_\)/_\1/g' $@
+	sed -e 's/\(peripheral\|memory\)_0_\(aw\|ar\|w\|r\|b\)_bits_/m_\1_\2_/g' \
+	-e 's/\(dma\)_0_\(aw\|ar\|w\|r\|b\)_bits_/s_\1_\2_/g' $@ > $(BUILD_DIR)/tmp.v
+	sed -e 's/\(peripheral\|memory\)_0_\(aw\|ar\|w\|r\|b\)_/m_\1_\2_/g' \
+	-e 's/\(dma\)_0_\(aw\|ar\|w\|r\|b\)_\(ready\|valid\)/s_\1_\2_\3/g' $(BUILD_DIR)/tmp.v > $(BUILD_DIR)/tmp1.v
+	rm $@ $(BUILD_DIR)/tmp.v
+	mv $(BUILD_DIR)/tmp1.v $@
 	@git log -n 1 >> .__head__
 	@git diff >> .__diff__
 	@sed -i 's/^/\/\// ' .__head__
diff --git a/scripts/parser.py b/scripts/parser.py
index 417c043d40097dd5a803e6b51baccc9aa63910fc..ddb99435789b1737ce27cc5d59c1a15190026675 100644
--- a/scripts/parser.py
+++ b/scripts/parser.py
@@ -680,7 +680,7 @@ def export_sram_files(release_path, top_module):
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Verilog parser for XS')
     parser.add_argument('top', type=str, help='top-level module')
-    parser.add_argument('--xs-home', type=str, help='path to XS')
+    parser.add_argument('--build-dir', type=str, default="./build", help='path to build directory')
     parser.add_argument('--config', type=str, default="Unknown", help='XSConfig')
     parser.add_argument('--prefix', type=str, help='module prefix')
     parser.add_argument('--ignore', type=str, default="", help='ignore modules (and their submodules)')
@@ -691,11 +691,8 @@ if __name__ == "__main__":
 
     args = parser.parse_args()
 
-    xs_home = args.xs_home
-    if xs_home is None:
-        xs_home = os.path.realpath(os.getenv("NOOP_HOME"))
-        assert(xs_home is not None)
-    build_path = os.path.join(xs_home, "build")
+    build_path = args.build_dir
+    assert(build_path is not None)
     files = get_files(build_path)
     if args.include is not None:
         for inc_path in args.include.split(","):