diff --git a/vyper/cli/vyper_compile.py b/vyper/cli/vyper_compile.py
index 86a63e80ad..4d68b7e5ce 100755
--- a/vyper/cli/vyper_compile.py
+++ b/vyper/cli/vyper_compile.py
@@ -244,7 +244,7 @@ def compile_files(
         "abi_python": "abi",
         "json": "abi",
         "ast": "ast_dict",
-        "raw_ast": "raw_ast_dict",
+        "unannotated_ast": "unannotated_ast_dict",
         "ir_json": "ir_dict",
     }
     final_formats = [translate_map.get(i, i) for i in output_formats]
diff --git a/vyper/cli/vyper_json.py b/vyper/cli/vyper_json.py
index df924d4d52..2720f20d23 100755
--- a/vyper/cli/vyper_json.py
+++ b/vyper/cli/vyper_json.py
@@ -323,8 +323,6 @@ def format_to_output_dict(compiler_data: dict) -> dict:
         output_dict["sources"][path] = {"id": data["source_id"]}
         if "ast_dict" in data:
             output_dict["sources"][path]["ast"] = data["ast_dict"]["ast"]
-        if "raw_ast_dict" in data:
-            output_dict["sources"][path]["raw_ast"] = data["raw_ast_dict"]["ast"]
 
         name = PurePath(path).stem
         output_dict["contracts"][path] = {name: {}}
diff --git a/vyper/compiler/__init__.py b/vyper/compiler/__init__.py
index 03d44cc39b..d67a4416c5 100644
--- a/vyper/compiler/__init__.py
+++ b/vyper/compiler/__init__.py
@@ -13,7 +13,7 @@
 
 OUTPUT_FORMATS = {
     # requires vyper_module
-    "raw_ast_dict": output.build_ast_dict,
+    "unannotated_ast_dict": output.build_ast_dict,
     "ast_dict": output.build_annotated_ast_dict,
     "layout": output.build_layout_output,
     # requires global_ctx