diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
index 6f1c180a3f192..c40e908ed5f1a 100644
--- a/libc/CMakeLists.txt
+++ b/libc/CMakeLists.txt
@@ -270,7 +270,7 @@ endif()
 if(LLVM_LIBC_ENABLE_LINTING)
   if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(LLVM_LIBC_ENABLE_LINTING OFF)
-    message(WARNING "C++ compiler is not clang++, linting with be disabled.")
+    message(WARNING "C++ compiler is not clang++, linting will be disabled.")
   else()
     if (NOT LLVM_LIBC_CLANG_TIDY)
       find_program(LLVM_LIBC_CLANG_TIDY NAMES clang-tidy)
diff --git a/libc/docs/dev/header_generation.rst b/libc/docs/dev/header_generation.rst
index 17a8d7af3a2c8..77a95ab3de160 100644
--- a/libc/docs/dev/header_generation.rst
+++ b/libc/docs/dev/header_generation.rst
@@ -44,15 +44,15 @@ To add through the command line:
 
    .. code-block:: none
 
-     python3 libc/utils/hdrgen/yaml_to_classes.py
-     libc/utils/hdrgen/yaml/[yaml_file.yaml] --add_function "<return_type>" <function_name> "<function_arg1, function_arg2>" <standard> <guard> <attribute>
+     python3 libc/utils/hdrgen/spec/yaml_to_classes.py
+     libc/utils/hdrgen/spec//[yaml_file.yaml] --add_function "<return_type>" <function_name> "<function_arg1, function_arg2>" <standard> <guard> <attribute>
 
    Example:
 
    .. code-block:: none
 
-      python3 libc/utils/hdrgen/yaml_to_classes.py
-      libc/utils/hdrgen/yaml/ctype.yaml --add_function "char" example_function
+      python3 libc/utils/hdrgen/spec/yaml_to_classes.py
+      libc/utils/hdrgen/spec//ctype.yaml --add_function "char" example_function
       "int, void, const void" stdc example_float example_attribute
 
    Keep in mind only the return_type and arguments have quotes around them. If
@@ -63,7 +63,7 @@ To add through the command line:
    examine.
 
 If you want to sort the functions alphabetically you can check out
-libc/utils/hdrgen/yaml_functions_sorted.py.
+libc/utils/hdrgen/spec/_functions_sorted.py.
 
 
 Testing
@@ -90,7 +90,7 @@ Common Errors
 
    .. code-block:: none
 
-      "/llvm-project/libc/utils/hdrgen/yaml_to_classes.py", line 67, in yaml_to_classes function_data["return_type"]
+      "/llvm-project/libc/utils/hdrgen/spec/yaml_to_classes.py", line 67, in yaml_to_classes function_data["return_type"]
 
    If you receive this error or any error pertaining to
    ``function_data[function_specific_component]`` while building the headers
@@ -118,7 +118,7 @@ Common Errors
    missing. Ensure the correct style and required files are present:
 
    | ``[header_name]``
-   | ``[../libc/utils/hdrgen/yaml/[yaml_file.yaml]``
+   | ``[../libc/utils/hdrgen/spec/[yaml_file.yaml]``
    | ``[header_name.h.def]``
    | ``[header_name.h]``
    | ``DEPENDS``
diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index e490840cafedb..52f4325a0ac77 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -32,7 +32,7 @@ endmacro()
 
 add_header_macro(
   ctype
-  ../libc/utils/hdrgen/yaml/ctype.yaml
+  ../libc/utils/hdrgen/spec/ctype.yaml
   ctype.h.def
   ctype.h
   DEPENDS
@@ -42,7 +42,7 @@ add_header_macro(
 
 add_header_macro(
   dirent
-  ../libc/utils/hdrgen/yaml/dirent.yaml
+  ../libc/utils/hdrgen/spec/dirent.yaml
   dirent.h.def
   dirent.h
   DEPENDS
@@ -54,7 +54,7 @@ add_header_macro(
 
 add_header_macro(
   fcntl
-  ../libc/utils/hdrgen/yaml/fcntl.yaml
+  ../libc/utils/hdrgen/spec/fcntl.yaml
   fcntl.h.def
   fcntl.h
   DEPENDS
@@ -70,7 +70,7 @@ add_header_macro(
 
 add_header_macro(
   dlfcn
-  ../libc/utils/hdrgen/yaml/dlfcn.yaml
+  ../libc/utils/hdrgen/spec/dlfcn.yaml
   dlfcn.h.def
   dlfcn.h
   DEPENDS
@@ -80,7 +80,7 @@ add_header_macro(
 
 add_header_macro(
   features
-  ../libc/utils/hdrgen/yaml/features.yaml
+  ../libc/utils/hdrgen/spec/features.yaml
   features.h.def
   features.h
   DEPENDS
@@ -90,7 +90,7 @@ add_header_macro(
 
 add_header_macro(
   fenv
-  ../libc/utils/hdrgen/yaml/fenv.yaml
+  ../libc/utils/hdrgen/spec/fenv.yaml
   fenv.h.def
   fenv.h
   DEPENDS
@@ -102,7 +102,7 @@ add_header_macro(
 
 add_header_macro(
   inttypes
-  ../libc/utils/hdrgen/yaml/inttypes.yaml
+  ../libc/utils/hdrgen/spec/inttypes.yaml
   inttypes.h.def
   inttypes.h
   DEPENDS
@@ -113,7 +113,7 @@ add_header_macro(
 
 add_header_macro(
   float
-  ../libc/utils/hdrgen/yaml/float.yaml
+  ../libc/utils/hdrgen/spec/float.yaml
   float.h.def
   float.h
   DEPENDS
@@ -122,7 +122,7 @@ add_header_macro(
 
 add_header_macro(
   stdint
-  ../libc/utils/hdrgen/yaml/stdint.yaml
+  ../libc/utils/hdrgen/spec/stdint.yaml
   stdint.h.def
   stdint.h
   DEPENDS
@@ -131,7 +131,7 @@ add_header_macro(
 
 add_header_macro(
   limits
-  ../libc/utils/hdrgen/yaml/limits.yaml
+  ../libc/utils/hdrgen/spec/limits.yaml
   limits.h.def
   limits.h
   DEPENDS
@@ -140,7 +140,7 @@ add_header_macro(
 
 add_header_macro(
   malloc
-  ../libc/utils/hdrgen/yaml/malloc.yaml
+  ../libc/utils/hdrgen/spec/malloc.yaml
   malloc.h.def
   malloc.h
   DEPENDS
@@ -150,7 +150,7 @@ add_header_macro(
 
 add_header_macro(
   math
-  ../libc/utils/hdrgen/yaml/math.yaml
+  ../libc/utils/hdrgen/spec/math.yaml
   math.h.def
   math.h
   DEPENDS
@@ -165,7 +165,7 @@ add_header_macro(
 
 add_header_macro(
   stdfix
-  ../libc/utils/hdrgen/yaml/stdfix.yaml
+  ../libc/utils/hdrgen/spec/stdfix.yaml
   stdfix.h.def
   stdfix.h
   DEPENDS
@@ -178,7 +178,7 @@ file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/arpa)
 
 add_header_macro(
   arpa_inet
-  ../libc/utils/hdrgen/yaml/arpa/inet.yaml
+  ../libc/utils/hdrgen/spec/arpa/inet.yaml
   arpa/inet.h.def
   arpa/inet.h
   DEPENDS
@@ -187,7 +187,7 @@ add_header_macro(
 
 add_header_macro(
   assert
-  ../libc/utils/hdrgen/yaml/assert.yaml
+  ../libc/utils/hdrgen/spec/assert.yaml
   assert.h.def
   assert.h
   DEPENDS
@@ -197,7 +197,7 @@ add_header_macro(
 
 add_header_macro(
   complex
-  ../libc/utils/hdrgen/yaml/complex.yaml
+  ../libc/utils/hdrgen/spec/complex.yaml
   complex.h.def
   complex.h
   DEPENDS
@@ -207,7 +207,7 @@ add_header_macro(
 
 add_header_macro(
   setjmp
-  ../libc/utils/hdrgen/yaml/setjmp.yaml
+  ../libc/utils/hdrgen/spec/setjmp.yaml
   setjmp.h.def
   setjmp.h
   DEPENDS
@@ -217,7 +217,7 @@ add_header_macro(
 
 add_header_macro(
   string
-  ../libc/utils/hdrgen/yaml/string.yaml
+  ../libc/utils/hdrgen/spec/string.yaml
   string.h.def
   string.h
   DEPENDS
@@ -228,7 +228,7 @@ add_header_macro(
 
 add_header_macro(
   strings
-  ../libc/utils/hdrgen/yaml/strings.yaml
+  ../libc/utils/hdrgen/spec/strings.yaml
   strings.h.def
   strings.h
   DEPENDS
@@ -238,7 +238,7 @@ add_header_macro(
 
 add_header_macro(
   search
-  ../libc/utils/hdrgen/yaml/search.yaml
+  ../libc/utils/hdrgen/spec/search.yaml
   search.h.def
   search.h
   DEPENDS
@@ -252,7 +252,7 @@ add_header_macro(
 
 add_header_macro(
   time
-  ../libc/utils/hdrgen/yaml/time.yaml
+  ../libc/utils/hdrgen/spec/time.yaml
   time.h.def
   time.h
   DEPENDS
@@ -268,7 +268,7 @@ add_header_macro(
 
 add_header_macro(
   threads
-  ../libc/utils/hdrgen/yaml/threads.yaml
+  ../libc/utils/hdrgen/spec/threads.yaml
   threads.h.def
   threads.h
   DEPENDS
@@ -285,7 +285,7 @@ add_header_macro(
 
 add_header_macro(
   errno
-  ../libc/utils/hdrgen/yaml/errno.yaml
+  ../libc/utils/hdrgen/spec/errno.yaml
   errno.h.def
   errno.h
   DEPENDS
@@ -295,7 +295,7 @@ add_header_macro(
 
 add_header_macro(
   signal
-  ../libc/utils/hdrgen/yaml/signal.yaml
+  ../libc/utils/hdrgen/spec/signal.yaml
   signal.h.def
   signal.h
   DEPENDS
@@ -311,7 +311,7 @@ add_header_macro(
 
 add_header_macro(
   stdbit
-  ../libc/utils/hdrgen/yaml/stdbit.yaml
+  ../libc/utils/hdrgen/spec/stdbit.yaml
   stdbit.h.def
   stdbit.h
   DEPENDS
@@ -321,7 +321,7 @@ add_header_macro(
 
 add_header_macro(
   stdckdint
-  ../libc/utils/hdrgen/yaml/stdckdint.yaml
+  ../libc/utils/hdrgen/spec/stdckdint.yaml
   stdckdint.h.def
   stdckdint.h
   DEPENDS
@@ -331,7 +331,7 @@ add_header_macro(
 
 add_header_macro(
   stdio
-  ../libc/utils/hdrgen/yaml/stdio.yaml
+  ../libc/utils/hdrgen/spec/stdio.yaml
   stdio.h.def
   stdio.h
   DEPENDS
@@ -347,7 +347,7 @@ add_header_macro(
 
 add_header_macro(
   stdlib
-  ../libc/utils/hdrgen/yaml/stdlib.yaml
+  ../libc/utils/hdrgen/spec/stdlib.yaml
   stdlib.h.def
   stdlib.h
   DEPENDS
@@ -366,7 +366,7 @@ add_header_macro(
 
 add_header_macro(
   unistd
-  ../libc/utils/hdrgen/yaml/unistd.yaml
+  ../libc/utils/hdrgen/spec/unistd.yaml
   unistd.h.def
   unistd.h
   DEPENDS
@@ -385,7 +385,7 @@ add_header_macro(
 
 add_header_macro(
   pthread
-  ../libc/utils/hdrgen/yaml/pthread.yaml
+  ../libc/utils/hdrgen/spec/pthread.yaml
   pthread.h.def
   pthread.h
   DEPENDS
@@ -409,7 +409,7 @@ add_header_macro(
 
 add_header_macro(
   sched
-  ../libc/utils/hdrgen/yaml/sched.yaml
+  ../libc/utils/hdrgen/spec/sched.yaml
   sched.h.def
   sched.h
   DEPENDS
@@ -426,7 +426,7 @@ add_header_macro(
 
 add_header_macro(
   spawn
-  ../libc/utils/hdrgen/yaml/spawn.yaml
+  ../libc/utils/hdrgen/spec/spawn.yaml
   spawn.h.def
   spawn.h
   DEPENDS
@@ -439,7 +439,7 @@ add_header_macro(
 
 add_header_macro(
   link
-  ../libc/utils/hdrgen/yaml/link.yaml
+  ../libc/utils/hdrgen/spec/link.yaml
   link.h.def
   link.h
   DEPENDS
@@ -449,7 +449,7 @@ add_header_macro(
 
 add_header_macro(
   elf
-  ../libc/utils/hdrgen/yaml/elf.yaml
+  ../libc/utils/hdrgen/spec/elf.yaml
   elf.h.def
   elf.h
   DEPENDS
@@ -463,7 +463,7 @@ file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/sys)
 
 add_header_macro(
   sys_auxv
-  ../libc/utils/hdrgen/yaml/sys/auxv.yaml
+  ../libc/utils/hdrgen/spec/sys/auxv.yaml
   sys/auxv.h.def
   sys/auxv.h
   DEPENDS
@@ -473,7 +473,7 @@ add_header_macro(
 
 add_header_macro(
   sys_epoll
-  ../libc/utils/hdrgen/yaml/sys/epoll.yaml
+  ../libc/utils/hdrgen/spec/sys/epoll.yaml
   sys/epoll.h.def
   sys/epoll.h
   DEPENDS
@@ -486,7 +486,7 @@ add_header_macro(
 
 add_header_macro(
   sys_ioctl
-  ../libc/utils/hdrgen/yaml/sys/ioctl.yaml
+  ../libc/utils/hdrgen/spec/sys/ioctl.yaml
   sys/ioctl.h.def
   sys/ioctl.h
   DEPENDS
@@ -496,7 +496,7 @@ add_header_macro(
 
 add_header_macro(
   sys_mman
-  ../libc/utils/hdrgen/yaml/sys/mman.yaml
+  ../libc/utils/hdrgen/spec/sys/mman.yaml
   sys/mman.h.def
   sys/mman.h
   DEPENDS
@@ -509,7 +509,7 @@ add_header_macro(
 
 add_header_macro(
   sys_prctl
-  ../libc/utils/hdrgen/yaml/sys/prctl.yaml
+  ../libc/utils/hdrgen/spec/sys/prctl.yaml
   sys/prctl.h.def
   sys/prctl.h
   DEPENDS
@@ -526,7 +526,7 @@ add_header(
 
 add_header_macro(
   sys_random
-  ../libc/utils/hdrgen/yaml/sys/random.yaml
+  ../libc/utils/hdrgen/spec/sys/random.yaml
   sys/random.h.def
   sys/random.h
   DEPENDS
@@ -538,7 +538,7 @@ add_header_macro(
 
 add_header_macro(
   sys_resource
-  ../libc/utils/hdrgen/yaml/sys/resource.yaml
+  ../libc/utils/hdrgen/spec/sys/resource.yaml
   sys/resource.h.def
   sys/resource.h
   DEPENDS
@@ -550,7 +550,7 @@ add_header_macro(
 
 add_header_macro(
   sys_stat
-  ../libc/utils/hdrgen/yaml/sys/stat.yaml
+  ../libc/utils/hdrgen/spec/sys/stat.yaml
   sys/stat.h.def
   sys/stat.h
   DEPENDS
@@ -572,7 +572,7 @@ add_header_macro(
 
 add_header_macro(
   sys_select
-  ../libc/utils/hdrgen/yaml/sys/select.yaml
+  ../libc/utils/hdrgen/spec/sys/select.yaml
   sys/select.h.def
   sys/select.h
   DEPENDS
@@ -588,7 +588,7 @@ add_header_macro(
 
 add_header_macro(
   sys_sendfile
-  ../libc/utils/hdrgen/yaml/sys/sendfile.yaml
+  ../libc/utils/hdrgen/spec/sys/sendfile.yaml
   sys/sendfile.h.def
   sys/sendfile.h
   DEPENDS
@@ -600,7 +600,7 @@ add_header_macro(
 
 add_header_macro(
   sys_socket
-  ../libc/utils/hdrgen/yaml/sys/socket.yaml
+  ../libc/utils/hdrgen/spec/sys/socket.yaml
   sys/socket.h.def
   sys/socket.h
   DEPENDS
@@ -616,7 +616,7 @@ add_header_macro(
 
 add_header_macro(
   sys_statvfs
-  ../libc/utils/hdrgen/yaml/sys/statvfs.yaml
+  ../libc/utils/hdrgen/spec/sys/statvfs.yaml
   sys/statvfs.h.def
   sys/statvfs.h
   DEPENDS
@@ -626,7 +626,7 @@ add_header_macro(
 
 add_header_macro(
   sys_syscall
-  ../libc/utils/hdrgen/yaml/sys/syscall.yaml
+  ../libc/utils/hdrgen/spec/sys/syscall.yaml
   sys/syscall.h.def
   sys/syscall.h
   DEPENDS
@@ -634,7 +634,7 @@ add_header_macro(
 
 add_header_macro(
   sys_time
-  ../libc/utils/hdrgen/yaml/sys/time.yaml
+  ../libc/utils/hdrgen/spec/sys/time.yaml
   sys/time.h.def
   sys/time.h
   DEPENDS
@@ -645,7 +645,7 @@ add_header_macro(
 
 add_header_macro(
   sys_types
-  ../libc/utils/hdrgen/yaml/sys/types.yaml
+  ../libc/utils/hdrgen/spec/sys/types.yaml
   sys/types.h.def
   sys/types.h
   DEPENDS
@@ -675,7 +675,7 @@ add_header_macro(
 
 add_header_macro(
   sys_utsname
-  ../libc/utils/hdrgen/yaml/sys/utsname.yaml
+  ../libc/utils/hdrgen/spec/sys/utsname.yaml
   sys/utsname.h.def
   sys/utsname.h
   DEPENDS
@@ -685,7 +685,7 @@ add_header_macro(
 
 add_header_macro(
   sys_wait
-  ../libc/utils/hdrgen/yaml/sys/wait.yaml
+  ../libc/utils/hdrgen/spec/sys/wait.yaml
   sys/wait.h.def
   sys/wait.h
   DEPENDS
@@ -698,7 +698,7 @@ add_header_macro(
 
 add_header_macro(
   termios
-  ../libc/utils/hdrgen/yaml/termios.yaml
+  ../libc/utils/hdrgen/spec/termios.yaml
   termios.h.def
   termios.h
   DEPENDS
@@ -713,7 +713,7 @@ add_header_macro(
 
 add_header_macro(
   uchar
-  ../libc/utils/hdrgen/yaml/uchar.yaml
+  ../libc/utils/hdrgen/spec/uchar.yaml
   uchar.h.def
   uchar.h
   DEPENDS
@@ -726,7 +726,7 @@ add_header_macro(
 
 add_header_macro(
   wchar
-  ../libc/utils/hdrgen/yaml/wchar.yaml
+  ../libc/utils/hdrgen/spec/wchar.yaml
   wchar.h.def
   wchar.h
   DEPENDS
@@ -740,7 +740,7 @@ add_header_macro(
 
 add_header_macro(
   locale
-  ../libc/utils/hdrgen/yaml/locale.yaml
+  ../libc/utils/hdrgen/spec/locale.yaml
   locale.h.def
   locale.h
   DEPENDS
diff --git a/libc/src/math/docs/add_math_function.md b/libc/src/math/docs/add_math_function.md
index 7d45bd02c4ff2..40d62fd1d5cdb 100644
--- a/libc/src/math/docs/add_math_function.md
+++ b/libc/src/math/docs/add_math_function.md
@@ -18,7 +18,7 @@ together with its specifications:
 ```
 - Add function specs to the file:
 ```
-  libc/utils/hdrgen/yaml/math.yaml
+  libc/utils/hdrgen/spec/math.yaml
 ```
 
 ## Implementation
diff --git a/libc/utils/hdrgen/yaml/arpa/inet.yaml b/libc/utils/hdrgen/spec/arpa/inet.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/arpa/inet.yaml
rename to libc/utils/hdrgen/spec/arpa/inet.yaml
diff --git a/libc/utils/hdrgen/yaml/assert.yaml b/libc/utils/hdrgen/spec/assert.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/assert.yaml
rename to libc/utils/hdrgen/spec/assert.yaml
diff --git a/libc/utils/hdrgen/yaml/complex.yaml b/libc/utils/hdrgen/spec/complex.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/complex.yaml
rename to libc/utils/hdrgen/spec/complex.yaml
diff --git a/libc/utils/hdrgen/yaml/ctype.yaml b/libc/utils/hdrgen/spec/ctype.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/ctype.yaml
rename to libc/utils/hdrgen/spec/ctype.yaml
diff --git a/libc/utils/hdrgen/yaml/dirent.yaml b/libc/utils/hdrgen/spec/dirent.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/dirent.yaml
rename to libc/utils/hdrgen/spec/dirent.yaml
diff --git a/libc/utils/hdrgen/yaml/dlfcn.yaml b/libc/utils/hdrgen/spec/dlfcn.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/dlfcn.yaml
rename to libc/utils/hdrgen/spec/dlfcn.yaml
diff --git a/libc/utils/hdrgen/yaml/elf.yaml b/libc/utils/hdrgen/spec/elf.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/elf.yaml
rename to libc/utils/hdrgen/spec/elf.yaml
diff --git a/libc/utils/hdrgen/yaml/errno.yaml b/libc/utils/hdrgen/spec/errno.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/errno.yaml
rename to libc/utils/hdrgen/spec/errno.yaml
diff --git a/libc/utils/hdrgen/yaml/fcntl.yaml b/libc/utils/hdrgen/spec/fcntl.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/fcntl.yaml
rename to libc/utils/hdrgen/spec/fcntl.yaml
diff --git a/libc/utils/hdrgen/yaml/features.yaml b/libc/utils/hdrgen/spec/features.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/features.yaml
rename to libc/utils/hdrgen/spec/features.yaml
diff --git a/libc/utils/hdrgen/yaml/fenv.yaml b/libc/utils/hdrgen/spec/fenv.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/fenv.yaml
rename to libc/utils/hdrgen/spec/fenv.yaml
diff --git a/libc/utils/hdrgen/yaml/float.yaml b/libc/utils/hdrgen/spec/float.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/float.yaml
rename to libc/utils/hdrgen/spec/float.yaml
diff --git a/libc/utils/hdrgen/yaml/inttypes.yaml b/libc/utils/hdrgen/spec/inttypes.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/inttypes.yaml
rename to libc/utils/hdrgen/spec/inttypes.yaml
diff --git a/libc/utils/hdrgen/yaml/limits.yaml b/libc/utils/hdrgen/spec/limits.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/limits.yaml
rename to libc/utils/hdrgen/spec/limits.yaml
diff --git a/libc/utils/hdrgen/yaml/link.yaml b/libc/utils/hdrgen/spec/link.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/link.yaml
rename to libc/utils/hdrgen/spec/link.yaml
diff --git a/libc/utils/hdrgen/yaml/locale.yaml b/libc/utils/hdrgen/spec/locale.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/locale.yaml
rename to libc/utils/hdrgen/spec/locale.yaml
diff --git a/libc/utils/hdrgen/yaml/malloc.yaml b/libc/utils/hdrgen/spec/malloc.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/malloc.yaml
rename to libc/utils/hdrgen/spec/malloc.yaml
diff --git a/libc/utils/hdrgen/yaml/math.yaml b/libc/utils/hdrgen/spec/math.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/math.yaml
rename to libc/utils/hdrgen/spec/math.yaml
diff --git a/libc/utils/hdrgen/yaml/pthread.yaml b/libc/utils/hdrgen/spec/pthread.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/pthread.yaml
rename to libc/utils/hdrgen/spec/pthread.yaml
diff --git a/libc/utils/hdrgen/yaml/sched.yaml b/libc/utils/hdrgen/spec/sched.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sched.yaml
rename to libc/utils/hdrgen/spec/sched.yaml
diff --git a/libc/utils/hdrgen/yaml/search.yaml b/libc/utils/hdrgen/spec/search.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/search.yaml
rename to libc/utils/hdrgen/spec/search.yaml
diff --git a/libc/utils/hdrgen/yaml/setjmp.yaml b/libc/utils/hdrgen/spec/setjmp.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/setjmp.yaml
rename to libc/utils/hdrgen/spec/setjmp.yaml
diff --git a/libc/utils/hdrgen/yaml/signal.yaml b/libc/utils/hdrgen/spec/signal.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/signal.yaml
rename to libc/utils/hdrgen/spec/signal.yaml
diff --git a/libc/utils/hdrgen/yaml/spawn.yaml b/libc/utils/hdrgen/spec/spawn.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/spawn.yaml
rename to libc/utils/hdrgen/spec/spawn.yaml
diff --git a/libc/utils/hdrgen/yaml/stdbit.yaml b/libc/utils/hdrgen/spec/stdbit.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdbit.yaml
rename to libc/utils/hdrgen/spec/stdbit.yaml
diff --git a/libc/utils/hdrgen/yaml/stdckdint.yaml b/libc/utils/hdrgen/spec/stdckdint.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdckdint.yaml
rename to libc/utils/hdrgen/spec/stdckdint.yaml
diff --git a/libc/utils/hdrgen/yaml/stdfix.yaml b/libc/utils/hdrgen/spec/stdfix.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdfix.yaml
rename to libc/utils/hdrgen/spec/stdfix.yaml
diff --git a/libc/utils/hdrgen/yaml/stdint.yaml b/libc/utils/hdrgen/spec/stdint.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdint.yaml
rename to libc/utils/hdrgen/spec/stdint.yaml
diff --git a/libc/utils/hdrgen/yaml/stdio.yaml b/libc/utils/hdrgen/spec/stdio.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdio.yaml
rename to libc/utils/hdrgen/spec/stdio.yaml
diff --git a/libc/utils/hdrgen/yaml/stdlib.yaml b/libc/utils/hdrgen/spec/stdlib.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdlib.yaml
rename to libc/utils/hdrgen/spec/stdlib.yaml
diff --git a/libc/utils/hdrgen/yaml/string.yaml b/libc/utils/hdrgen/spec/string.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/string.yaml
rename to libc/utils/hdrgen/spec/string.yaml
diff --git a/libc/utils/hdrgen/yaml/strings.yaml b/libc/utils/hdrgen/spec/strings.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/strings.yaml
rename to libc/utils/hdrgen/spec/strings.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/auxv.yaml b/libc/utils/hdrgen/spec/sys/auxv.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/auxv.yaml
rename to libc/utils/hdrgen/spec/sys/auxv.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/epoll.yaml b/libc/utils/hdrgen/spec/sys/epoll.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/epoll.yaml
rename to libc/utils/hdrgen/spec/sys/epoll.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/ioctl.yaml b/libc/utils/hdrgen/spec/sys/ioctl.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/ioctl.yaml
rename to libc/utils/hdrgen/spec/sys/ioctl.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/mman.yaml b/libc/utils/hdrgen/spec/sys/mman.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/mman.yaml
rename to libc/utils/hdrgen/spec/sys/mman.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/prctl.yaml b/libc/utils/hdrgen/spec/sys/prctl.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/prctl.yaml
rename to libc/utils/hdrgen/spec/sys/prctl.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/random.yaml b/libc/utils/hdrgen/spec/sys/random.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/random.yaml
rename to libc/utils/hdrgen/spec/sys/random.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/resource.yaml b/libc/utils/hdrgen/spec/sys/resource.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/resource.yaml
rename to libc/utils/hdrgen/spec/sys/resource.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/select.yaml b/libc/utils/hdrgen/spec/sys/select.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/select.yaml
rename to libc/utils/hdrgen/spec/sys/select.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/sendfile.yaml b/libc/utils/hdrgen/spec/sys/sendfile.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/sendfile.yaml
rename to libc/utils/hdrgen/spec/sys/sendfile.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/socket.yaml b/libc/utils/hdrgen/spec/sys/socket.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/socket.yaml
rename to libc/utils/hdrgen/spec/sys/socket.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/stat.yaml b/libc/utils/hdrgen/spec/sys/stat.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/stat.yaml
rename to libc/utils/hdrgen/spec/sys/stat.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/statvfs.yaml b/libc/utils/hdrgen/spec/sys/statvfs.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/statvfs.yaml
rename to libc/utils/hdrgen/spec/sys/statvfs.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/syscall.yaml b/libc/utils/hdrgen/spec/sys/syscall.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/syscall.yaml
rename to libc/utils/hdrgen/spec/sys/syscall.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/time.yaml b/libc/utils/hdrgen/spec/sys/time.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/time.yaml
rename to libc/utils/hdrgen/spec/sys/time.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/types.yaml b/libc/utils/hdrgen/spec/sys/types.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/types.yaml
rename to libc/utils/hdrgen/spec/sys/types.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/utsname.yaml b/libc/utils/hdrgen/spec/sys/utsname.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/utsname.yaml
rename to libc/utils/hdrgen/spec/sys/utsname.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/wait.yaml b/libc/utils/hdrgen/spec/sys/wait.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/wait.yaml
rename to libc/utils/hdrgen/spec/sys/wait.yaml
diff --git a/libc/utils/hdrgen/yaml/termios.yaml b/libc/utils/hdrgen/spec/termios.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/termios.yaml
rename to libc/utils/hdrgen/spec/termios.yaml
diff --git a/libc/utils/hdrgen/yaml/threads.yaml b/libc/utils/hdrgen/spec/threads.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/threads.yaml
rename to libc/utils/hdrgen/spec/threads.yaml
diff --git a/libc/utils/hdrgen/yaml/time.yaml b/libc/utils/hdrgen/spec/time.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/time.yaml
rename to libc/utils/hdrgen/spec/time.yaml
diff --git a/libc/utils/hdrgen/yaml/uchar.yaml b/libc/utils/hdrgen/spec/uchar.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/uchar.yaml
rename to libc/utils/hdrgen/spec/uchar.yaml
diff --git a/libc/utils/hdrgen/yaml/unistd.yaml b/libc/utils/hdrgen/spec/unistd.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/unistd.yaml
rename to libc/utils/hdrgen/spec/unistd.yaml
diff --git a/libc/utils/hdrgen/yaml/wchar.yaml b/libc/utils/hdrgen/spec/wchar.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/wchar.yaml
rename to libc/utils/hdrgen/spec/wchar.yaml