diff --git a/scripts/prompt_driver.py b/scripts/prompt_driver.py
index 4b030ab..16c9e0c 100644
--- a/scripts/prompt_driver.py
+++ b/scripts/prompt_driver.py
@@ -49,9 +49,9 @@ def get_named_bc(bc_file):
             args.bc_file,
             "-o",
             named_bc,
-            "-load",
+            "-load-pass-plugin="+
             SLAMP_LIB_PATH,
-            "-prompt-metadata-namer",
+            "-passes=prompt-metadata-namer",
         ],
         check=True,
     )
@@ -70,7 +70,7 @@ def compile_frontend(bc_file, module, target_fcn, target_loop, compile_output):
     exe = bc_file.replace(".bc", ".slamp.exe")
 
     instrument_cmd = (
-        f"opt -load {SLAMP_LIB_PATH} -slamp-insts -o {prelink_bc} {bc_file}"
+        f"opt -load {SLAMP_LIB_PATH} -load-pass-plugin={SLAMP_LIB_PATH} -passes=slamp-insts -o {prelink_bc} {bc_file}"
     )
     if target_loop is None:
         instrument_cmd += " -slamp-target-loop-enabled=0"
diff --git a/src/instrumentation/SLAMP.cpp b/src/instrumentation/SLAMP.cpp
index 8a07a33..a5880ad 100644
--- a/src/instrumentation/SLAMP.cpp
+++ b/src/instrumentation/SLAMP.cpp
@@ -59,7 +59,7 @@ llvmGetPassPluginInfo() {
             PB.registerPipelineParsingCallback(
                 [](llvm::StringRef Name, llvm::ModulePassManager &MPM,
                    llvm::ArrayRef<llvm::PassBuilder::PipelineElement>) {
-                  if (Name == "prompt-namer") {
+                  if (Name == "prompt-metadata-namer") {
                     MPM.addPass(liberty::Namer());
                     return true; // Successfully handled the given pipeline name
                   }