diff --git a/osbase/build/fsspec/BUILD.bazel b/osbase/build/fsspec/BUILD.bazel
index c4658bf..2b17b8d 100644
--- a/osbase/build/fsspec/BUILD.bazel
+++ b/osbase/build/fsspec/BUILD.bazel
@@ -9,7 +9,6 @@
         "PACKAGE_VERSION_SUFFIX",
         "ENUM_VALUE_PREFIX",  # TODO: evaluate correctness
         "ENUM_ZERO_VALUE_SUFFIX",  # TODO: evaluate correctness
-        "PACKAGE_DIRECTORY_MATCH",  # TODO: evaluate correctness
     ],
     protos = [":spec_proto"],
     use_rules = [
diff --git a/osbase/build/fsspec/spec.proto b/osbase/build/fsspec/spec.proto
index 487eebf..25963a1 100644
--- a/osbase/build/fsspec/spec.proto
+++ b/osbase/build/fsspec/spec.proto
@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 
-package osbase.node.build.fsspec;
+package osbase.build.fsspec;
 option go_package = "source.monogon.dev/osbase/build/fsspec";
 
 // FSSpec is the spec from which a filesystem is generated. It consists of files, directories and symbolic
diff --git a/osbase/build/mkucode/spec/BUILD.bazel b/osbase/build/mkucode/spec/BUILD.bazel
index 08df104..eea08f4 100644
--- a/osbase/build/mkucode/spec/BUILD.bazel
+++ b/osbase/build/mkucode/spec/BUILD.bazel
@@ -7,7 +7,6 @@
     name = "mkucode_proto_lint_test",
     except_rules = [
         "PACKAGE_VERSION_SUFFIX",
-        "PACKAGE_DIRECTORY_MATCH",  # TODO: evaluate correctness
     ],
     protos = [":mkucode_proto"],
     use_rules = [
diff --git a/osbase/build/mkucode/spec/spec.proto b/osbase/build/mkucode/spec/spec.proto
index 36fcc4c..bfdaf86 100644
--- a/osbase/build/mkucode/spec/spec.proto
+++ b/osbase/build/mkucode/spec/spec.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package osbase.build.mkucode;
+package osbase.build.mkucode.spec;
 option go_package = "source.monogon.dev/osbase/build/mkucode/spec";
 
 message UCode {
diff --git a/osbase/kmod/spec/BUILD.bazel b/osbase/kmod/spec/BUILD.bazel
index 73390dc..5ff430e 100644
--- a/osbase/kmod/spec/BUILD.bazel
+++ b/osbase/kmod/spec/BUILD.bazel
@@ -9,7 +9,6 @@
         "PACKAGE_VERSION_SUFFIX",
         "ENUM_VALUE_PREFIX",  # TODO: evaluate correctness
         "ENUM_ZERO_VALUE_SUFFIX",  # TODO: evaluate correctness
-        "PACKAGE_DIRECTORY_MATCH",  # TODO: evaluate correctness
     ],
     protos = [":spec_proto"],
     use_rules = [
diff --git a/osbase/kmod/spec/meta.proto b/osbase/kmod/spec/meta.proto
index ed2cc73..2eb5c7a 100644
--- a/osbase/kmod/spec/meta.proto
+++ b/osbase/kmod/spec/meta.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package metropolis.pkg.kmod;
+package osbase.kmod.spec;
 
 option go_package = "source.monogon.dev/osbase/kmod/spec";
 
diff --git a/osbase/logtree/proto/BUILD.bazel b/osbase/logtree/proto/BUILD.bazel
index e5b6bea..b7b76d4 100644
--- a/osbase/logtree/proto/BUILD.bazel
+++ b/osbase/logtree/proto/BUILD.bazel
@@ -9,7 +9,6 @@
         "PACKAGE_VERSION_SUFFIX",
         "ENUM_VALUE_PREFIX",  # TODO: evaluate correctness
         "ENUM_ZERO_VALUE_SUFFIX",  # TODO: evaluate correctness
-        "PACKAGE_DIRECTORY_MATCH",  # TODO: evaluate correctness
     ],
     protos = [":proto_proto"],
     use_rules = [
diff --git a/osbase/logtree/proto/logtree.proto b/osbase/logtree/proto/logtree.proto
index bf341d4..fb80a71 100644
--- a/osbase/logtree/proto/logtree.proto
+++ b/osbase/logtree/proto/logtree.proto
@@ -15,7 +15,7 @@
 // limitations under the License.
 
 syntax = "proto3";
-package osbase.pkg.logtree.proto;
+package osbase.logtree.proto;
 option go_package = "source.monogon.dev/osbase/logtree/proto";
 
 import "google/protobuf/timestamp.proto";
diff --git a/osbase/tpm/proto/BUILD.bazel b/osbase/tpm/proto/BUILD.bazel
index 060e3b4..b71291a 100644
--- a/osbase/tpm/proto/BUILD.bazel
+++ b/osbase/tpm/proto/BUILD.bazel
@@ -7,7 +7,6 @@
     name = "proto_proto_lint_test",
     except_rules = [
         "PACKAGE_VERSION_SUFFIX",
-        "PACKAGE_DIRECTORY_MATCH",  # TODO: evaluate correctness
     ],
     protos = [":proto_proto"],
     use_rules = [
diff --git a/osbase/tpm/proto/tpm.proto b/osbase/tpm/proto/tpm.proto
index fc70223..5c7ffe0 100644
--- a/osbase/tpm/proto/tpm.proto
+++ b/osbase/tpm/proto/tpm.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = "source.monogon.dev/osbase/tpm/proto";
-package osbase.pkg.tpm;
+package osbase.tpm.proto;
 
 import "proto/tpm/tpm.proto";