diff --git a/osbase/build/earlydev.fsspec b/osbase/build/earlydev.fsspec
index a7d2ea4..310616b 100644
--- a/osbase/build/earlydev.fsspec
+++ b/osbase/build/earlydev.fsspec
@@ -7,25 +7,25 @@
 # device manager (ie. devtmpfs) is launched.
 special_file <
     path: "/dev/console"
-    type: CHARACTER_DEV
+    type: TYPE_CHARACTER_DEV
     major: 5 minor: 1
     mode: 0600 uid: 0 gid: 0
 >
 special_file <
     path: "/dev/ptmx"
-    type: CHARACTER_DEV
+    type: TYPE_CHARACTER_DEV
     major: 5 minor: 2
     mode: 0644 uid: 0 gid: 0
 >
 special_file <
     path: "/dev/null"
-    type: CHARACTER_DEV
+    type: TYPE_CHARACTER_DEV
     major: 1 minor: 3
     mode: 0644 uid: 0 gid: 0
 >
 special_file <
     path: "/dev/kmsg"
-    type: CHARACTER_DEV
+    type: TYPE_CHARACTER_DEV
     major: 1 minor: 11
     mode: 0644 uid: 0 gid: 0
 >
@@ -36,19 +36,19 @@
 # log there, too.
 special_file <
     path: "/dev/tty0"
-    type: CHARACTER_DEV
+    type: TYPE_CHARACTER_DEV
     major: 4 minor: 0
     mode: 0600 uid: 0 gid: 0
 >
 special_file <
     path: "/dev/ttyS0"
-    type: CHARACTER_DEV
+    type: TYPE_CHARACTER_DEV
     major: 4 minor: 64
     mode: 0660 uid: 0 gid: 0
 >
 special_file <
     path: "/dev/ttyS1"
-    type: CHARACTER_DEV
+    type: TYPE_CHARACTER_DEV
     major: 4 minor: 65
     mode: 0660 uid: 0 gid: 0
 >
\ No newline at end of file
diff --git a/osbase/build/fsspec/BUILD.bazel b/osbase/build/fsspec/BUILD.bazel
index 2b17b8d..0cb2c55 100644
--- a/osbase/build/fsspec/BUILD.bazel
+++ b/osbase/build/fsspec/BUILD.bazel
@@ -7,7 +7,6 @@
     name = "spec_proto_lint_test",
     except_rules = [
         "PACKAGE_VERSION_SUFFIX",
-        "ENUM_VALUE_PREFIX",  # TODO: evaluate correctness
         "ENUM_ZERO_VALUE_SUFFIX",  # TODO: evaluate correctness
     ],
     protos = [":spec_proto"],
diff --git a/osbase/build/fsspec/spec.proto b/osbase/build/fsspec/spec.proto
index 25963a1..3c98fdb 100644
--- a/osbase/build/fsspec/spec.proto
+++ b/osbase/build/fsspec/spec.proto
@@ -76,9 +76,9 @@
   string path = 1;
 
   enum Type {
-    CHARACTER_DEV = 0;
-    BLOCK_DEV = 1;
-    FIFO = 2;
+    TYPE_CHARACTER_DEV = 0;
+    TYPE_BLOCK_DEV = 1;
+    TYPE_FIFO = 2;
   }
 
   // Type of special file.
diff --git a/osbase/build/mkcpio/main.go b/osbase/build/mkcpio/main.go
index 4886c3c..000a979 100644
--- a/osbase/build/mkcpio/main.go
+++ b/osbase/build/mkcpio/main.go
@@ -196,11 +196,11 @@
 		case *fsspec.SpecialFile:
 			mode := cpio.FileMode(i.Mode)
 			switch i.Type {
-			case fsspec.SpecialFile_CHARACTER_DEV:
+			case fsspec.SpecialFile_TYPE_CHARACTER_DEV:
 				mode |= cpio.TypeChar
-			case fsspec.SpecialFile_BLOCK_DEV:
+			case fsspec.SpecialFile_TYPE_BLOCK_DEV:
 				mode |= cpio.TypeBlock
-			case fsspec.SpecialFile_FIFO:
+			case fsspec.SpecialFile_TYPE_FIFO:
 				mode |= cpio.TypeFifo
 			}
 
diff --git a/osbase/build/mkerofs/main.go b/osbase/build/mkerofs/main.go
index edcfdb9..12cde48 100644
--- a/osbase/build/mkerofs/main.go
+++ b/osbase/build/mkerofs/main.go
@@ -97,17 +97,17 @@
 			GID:         uint16(inode.SpecialFile.Gid),
 		}
 		switch inode.SpecialFile.Type {
-		case fsspec.SpecialFile_FIFO:
+		case fsspec.SpecialFile_TYPE_FIFO:
 			err = w.Create(pathname, &erofs.FIFO{
 				Base: base,
 			})
-		case fsspec.SpecialFile_CHARACTER_DEV:
+		case fsspec.SpecialFile_TYPE_CHARACTER_DEV:
 			err = w.Create(pathname, &erofs.CharacterDevice{
 				Base:  base,
 				Major: inode.SpecialFile.Major,
 				Minor: inode.SpecialFile.Minor,
 			})
-		case fsspec.SpecialFile_BLOCK_DEV:
+		case fsspec.SpecialFile_TYPE_BLOCK_DEV:
 			err = w.Create(pathname, &erofs.BlockDevice{
 				Base:  base,
 				Major: inode.SpecialFile.Major,