diff --git a/meson-to-hermetic/.gitignore b/meson_to_hermetic/.gitignore
similarity index 100%
rename from meson-to-hermetic/.gitignore
rename to meson_to_hermetic/.gitignore
diff --git a/meson-to-hermetic/README.md b/meson_to_hermetic/README.md
similarity index 93%
rename from meson-to-hermetic/README.md
rename to meson_to_hermetic/README.md
index 06c8518f601..b682002d2e2 100644
--- a/meson-to-hermetic/README.md
+++ b/meson_to_hermetic/README.md
@@ -15,12 +15,12 @@ Status: useful, but rough.  Supports Android (Soong) and Fuchsia (Bazel).
 
 ## Environment Setup
 
-1. Open a terminal within `mesa3d/meson-to-hermetic`
+1. Open a terminal within `mesa3d/meson_to_hermetic`
 2. Run the `setup-venv.sh` file to automatically create a python3 venv and install dependencies.
 
 ## Linting the code
 1. Before pushing code for review; run `lint.sh` to automatically lint all of the python scripts.
-    - IMPORTANT: Run the lint.sh from the `meson-to-hermetic` directory.
+    - IMPORTANT: Run the lint.sh from the `meson_to_hermetic` directory.
 
 ## 1 - Generate python from meson
 
diff --git a/meson-to-hermetic/aosp.toml b/meson_to_hermetic/aosp.toml
similarity index 100%
rename from meson-to-hermetic/aosp.toml
rename to meson_to_hermetic/aosp.toml
diff --git a/meson-to-hermetic/build-android-turnip.sh b/meson_to_hermetic/build-android-turnip.sh
similarity index 96%
rename from meson-to-hermetic/build-android-turnip.sh
rename to meson_to_hermetic/build-android-turnip.sh
index 7d227d0b33f..358a0fae0ed 100755
--- a/meson-to-hermetic/build-android-turnip.sh
+++ b/meson_to_hermetic/build-android-turnip.sh
@@ -27,7 +27,7 @@ else
 fi
 
 # Always generate Android.bp because it's fast
-PYTHONPATH=$BIN_DIR python3 generate_android_build.py --config=meson-to-hermetic/aosp.toml
+PYTHONPATH=$BIN_DIR python3 generate_android_build.py --config=meson_to_hermetic/aosp.toml
 
 source $ROOT_DIR/build/envsetup.sh
 lunch aosp_trout_arm64-trunk_staging-userdebug
diff --git a/meson-to-hermetic/build-fuchsia-turnip.sh b/meson_to_hermetic/build-fuchsia-turnip.sh
similarity index 86%
rename from meson-to-hermetic/build-fuchsia-turnip.sh
rename to meson_to_hermetic/build-fuchsia-turnip.sh
index b14c821d721..2fd5640877f 100755
--- a/meson-to-hermetic/build-fuchsia-turnip.sh
+++ b/meson_to_hermetic/build-fuchsia-turnip.sh
@@ -25,9 +25,9 @@ function unwrap_zlib {
     pushd fuchsia-build/third_party/zlib-*
     # Create an empty workspace
     touch WORKSPACE.bazel
-    ln -s ../../../meson-to-hermetic meson-to-hermetic
-    python3 meson-to-hermetic/generate_python_build.py --target fuchsia
-    PYTHONPATH=$PWD/meson-to-hermetic python3 generate_fuchsia_build.py --config=meson-to-hermetic/fuchsia.toml
+    ln -s ../../../meson_to_hermetic meson_to_hermetic
+    python3 meson_to_hermetic/generate_python_build.py --target fuchsia
+    PYTHONPATH=$PWD/meson_to_hermetic python3 generate_fuchsia_build.py --config=meson_to_hermetic/fuchsia.toml
     popd
 }
 
@@ -50,7 +50,7 @@ else
 fi
 
 # Always generate Android.bp because it's fast
-PYTHONPATH=$BIN_DIR python3 generate_fuchsia_build.py --config=meson-to-hermetic/fuchsia.toml
+PYTHONPATH=$BIN_DIR python3 generate_fuchsia_build.py --config=meson_to_hermetic/fuchsia.toml
 
 $BIN_DIR/../tools/bazel --bazelrc=fuchsia-build/third_party/fuchsia-infra-bazel-rules/config/common_config.bazelrc \
     build --config=fuchsia_arm64 --platforms=@fuchsia_sdk//fuchsia/constraints/platforms:fuchsia_arm64 \
diff --git a/meson-to-hermetic/fuchsia.toml b/meson_to_hermetic/fuchsia.toml
similarity index 100%
rename from meson-to-hermetic/fuchsia.toml
rename to meson_to_hermetic/fuchsia.toml
diff --git a/meson-to-hermetic/generate_python_build.py b/meson_to_hermetic/generate_python_build.py
similarity index 100%
rename from meson-to-hermetic/generate_python_build.py
rename to meson_to_hermetic/generate_python_build.py
diff --git a/meson-to-hermetic/lint.sh b/meson_to_hermetic/lint.sh
similarity index 100%
rename from meson-to-hermetic/lint.sh
rename to meson_to_hermetic/lint.sh
diff --git a/meson-to-hermetic/meson2python.py b/meson_to_hermetic/meson2python.py
similarity index 100%
rename from meson-to-hermetic/meson2python.py
rename to meson_to_hermetic/meson2python.py
diff --git a/meson-to-hermetic/meson_common.py b/meson_to_hermetic/meson_common.py
similarity index 100%
rename from meson-to-hermetic/meson_common.py
rename to meson_to_hermetic/meson_common.py
diff --git a/meson-to-hermetic/meson_impl.py b/meson_to_hermetic/meson_impl.py
similarity index 100%
rename from meson-to-hermetic/meson_impl.py
rename to meson_to_hermetic/meson_impl.py
diff --git a/meson-to-hermetic/meson_to_hermetic.py b/meson_to_hermetic/meson_to_hermetic.py
similarity index 100%
rename from meson-to-hermetic/meson_to_hermetic.py
rename to meson_to_hermetic/meson_to_hermetic.py
diff --git a/meson-to-hermetic/requirements.txt b/meson_to_hermetic/requirements.txt
similarity index 100%
rename from meson-to-hermetic/requirements.txt
rename to meson_to_hermetic/requirements.txt
diff --git a/meson-to-hermetic/setup-venv.sh b/meson_to_hermetic/setup-venv.sh
similarity index 100%
rename from meson-to-hermetic/setup-venv.sh
rename to meson_to_hermetic/setup-venv.sh
diff --git a/meson-to-hermetic/templates/generate_python_build.txt b/meson_to_hermetic/templates/generate_python_build.txt
similarity index 100%
rename from meson-to-hermetic/templates/generate_python_build.txt
rename to meson_to_hermetic/templates/generate_python_build.txt