Rename display modules to dir_pwexperimental_*

This will allow for easier migration to upstream Pigweed

Change-Id: I473dba11344ed87e92f545f36b696a9bda1d81ff
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/201070
Reviewed-by: Armando Montanez <amontanez@google.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Anthony DiGirolamo <tonymd@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
diff --git a/BUILD.gn b/BUILD.gn
index cca71ab..f3fa0dd 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -43,10 +43,10 @@
 group("host") {
   deps = [
     ":host_tests(//targets/host:host_debug_tests)",
-    "$dir_pw_color:tests.run(//targets/host:host_debug_tests)",
-    "$dir_pw_display:tests.run(//targets/host:host_debug_tests)",
-    "$dir_pw_draw:tests.run(//targets/host:host_debug_tests)",
-    "$dir_pw_framebuffer:tests.run(//targets/host:host_debug_tests)",
+    "$dir_pwexperimental_color:tests.run(//targets/host:host_debug_tests)",
+    "$dir_pwexperimental_display:tests.run(//targets/host:host_debug_tests)",
+    "$dir_pwexperimental_draw:tests.run(//targets/host:host_debug_tests)",
+    "$dir_pwexperimental_framebuffer:tests.run(//targets/host:host_debug_tests)",
 
     # See //applications/pw_lcd_display_host_imgui/README.md for instructions.
     "//applications/32blit_demo:all(//targets/host:host_debug)",
diff --git a/applications/32blit_demo/BUILD.gn b/applications/32blit_demo/BUILD.gn
index ce0c8e6..239bfae 100644
--- a/applications/32blit_demo/BUILD.gn
+++ b/applications/32blit_demo/BUILD.gn
@@ -32,16 +32,16 @@
   deps = [
     "$dir_app_common",
     "$dir_pw_board_led",
-    "$dir_pw_color",
-    "$dir_pw_display",
-    "$dir_pw_draw",
-    "$dir_pw_framebuffer",
     "$dir_pw_log",
     "$dir_pw_random",
     "$dir_pw_ring_buffer",
     "$dir_pw_spin_delay",
     "$dir_pw_string",
     "$dir_pw_sys_io",
+    "$dir_pwexperimental_color",
+    "$dir_pwexperimental_display",
+    "$dir_pwexperimental_draw",
+    "$dir_pwexperimental_framebuffer",
     "$pw_dir_third_party_32blit:32blit",
   ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
diff --git a/applications/app_common/BUILD.gn b/applications/app_common/BUILD.gn
index ec34126..35c9889 100644
--- a/applications/app_common/BUILD.gn
+++ b/applications/app_common/BUILD.gn
@@ -27,8 +27,8 @@
   backend = app_common_BACKEND
   public_configs = [ ":public_includes" ]
   public_deps = [
-    "$dir_pw_display",
     "$dir_pw_status",
+    "$dir_pwexperimental_display",
   ]
   public = [ "public/app_common/common.h" ]
 }
diff --git a/applications/app_common_impl/BUILD.gn b/applications/app_common_impl/BUILD.gn
index 8ab0ee9..596b8a0 100644
--- a/applications/app_common_impl/BUILD.gn
+++ b/applications/app_common_impl/BUILD.gn
@@ -74,12 +74,12 @@
   deps = [
     "$dir_pigweed_experimental/applications/app_common:app_common.facade",
     "$dir_pw_digital_io_stm32cube",
-    "$dir_pw_display",
-    "$dir_pw_display_driver_ili9341",
-    "$dir_pw_framebuffer_pool",
     "$dir_pw_spi_stm32cube",
     "$dir_pw_sync:borrow",
     "$dir_pw_sync:mutex",
+    "$dir_pwexperimental_display",
+    "$dir_pwexperimental_display_driver_ili9341",
+    "$dir_pwexperimental_framebuffer_pool",
   ]
   sources = [ "common_stm32cube.cc" ]
 }
@@ -87,7 +87,7 @@
 pw_source_set("stm32") {
   deps = [
     "$dir_pigweed_experimental/applications/app_common:app_common.facade",
-    "$dir_pw_display_driver_null",
+    "$dir_pwexperimental_display_driver_null",
   ]
   sources = [ "common_stm32.cc" ]
 }
@@ -100,12 +100,12 @@
   deps = [
     "$dir_pigweed_experimental/applications/app_common:app_common.facade",
     "$dir_pw_digital_io_arduino",
-    "$dir_pw_display",
-    "$dir_pw_display_driver_ili9341",
     "$dir_pw_spi_arduino",
     "$dir_pw_sync:borrow",
     "$dir_pw_sync:mutex",
     "$dir_pw_third_party/arduino:arduino_core_sources",
+    "$dir_pwexperimental_display",
+    "$dir_pwexperimental_display_driver_ili9341",
   ]
   sources = [ "common_arduino.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
@@ -116,10 +116,10 @@
     public_configs = [ ":common_flags" ]
     deps = [
       "$dir_pigweed_experimental/applications/app_common:app_common.facade",
-      "$dir_pw_display",
-      "$dir_pw_display_driver_mipi_dsi",
-      "$dir_pw_framebuffer_pool_mcuxpresso",
-      "$dir_pw_mipi_dsi_mcuxpresso",
+      "$dir_pwexperimental_display",
+      "$dir_pwexperimental_display_driver_mipi_dsi",
+      "$dir_pwexperimental_framebuffer_pool_mcuxpresso",
+      "$dir_pwexperimental_mipi_dsi_mcuxpresso",
       "$pw_third_party_mcuxpresso_SDK",
     ]
     sources = [ "common_mimxrt595.cc" ]
@@ -134,13 +134,13 @@
   "$PICO_ROOT/src/rp2_common/hardware_vreg",
   "$dir_pigweed_experimental/applications/app_common:app_common.facade",
   "$dir_pw_digital_io_rp2040",
-  "$dir_pw_display",
-  "$dir_pw_framebuffer_pool",
   "$dir_pw_i2c_rp2040",
   "$dir_pw_log",
   "$dir_pw_spi_rp2040",
   "$dir_pw_sync:borrow",
   "$dir_pw_sync:mutex",
+  "$dir_pwexperimental_display",
+  "$dir_pwexperimental_framebuffer_pool",
 ]
 
 pw_source_set("pico_ili9341") {
@@ -150,7 +150,7 @@
   ]
   cflags = [ "-DDISPLAY_TYPE_ILI9341" ]
   deps = _pico_common_deps
-  deps += [ "$dir_pw_display_driver_ili9341" ]
+  deps += [ "$dir_pwexperimental_display_driver_ili9341" ]
   sources = [ "common_pico.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
 }
@@ -162,7 +162,7 @@
   ]
   cflags = [ "-DDISPLAY_TYPE_ST7789" ]
   deps = _pico_common_deps
-  deps += [ "$dir_pw_display_driver_st7789" ]
+  deps += [ "$dir_pwexperimental_display_driver_st7789" ]
   sources = [ "common_pico.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
 }
@@ -176,8 +176,8 @@
   cflags = [ "-DDISPLAY_TYPE_ST7789_PIO" ]
   deps = _pico_common_deps
   deps += [
-    "$dir_pw_display_driver_st7789",
-    "$dir_pw_pixel_pusher_rp2040_pio",
+    "$dir_pwexperimental_display_driver_st7789",
+    "$dir_pwexperimental_pixel_pusher_rp2040_pio",
   ]
   sources = [ "common_pico.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
@@ -190,7 +190,7 @@
   ]
   cflags = [ "-DDISPLAY_TYPE_ST7735" ]
   deps = _pico_common_deps
-  deps += [ "$dir_pw_display_driver_st7735" ]
+  deps += [ "$dir_pwexperimental_display_driver_st7735" ]
   sources = [ "common_pico.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
 }
@@ -199,9 +199,9 @@
   public_configs = [ ":common_flags" ]
   deps = [
     "$dir_pigweed_experimental/applications/app_common:app_common.facade",
-    "$dir_pw_display_driver_imgui",
-    "$dir_pw_display_imgui",
-    "$dir_pw_framebuffer_pool",
+    "$dir_pwexperimental_display_driver_imgui",
+    "$dir_pwexperimental_display_imgui",
+    "$dir_pwexperimental_framebuffer_pool",
   ]
   sources = [ "common_host_imgui.cc" ]
   remove_configs = []
@@ -214,8 +214,8 @@
   public_configs = [ ":common_flags" ]
   deps = [
     "$dir_pigweed_experimental/applications/app_common:app_common.facade",
-    "$dir_pw_display",
-    "$dir_pw_display_driver_null",
+    "$dir_pwexperimental_display",
+    "$dir_pwexperimental_display_driver_null",
   ]
   sources = [ "common_host_null.cc" ]
 }
diff --git a/applications/terminal_display/BUILD.gn b/applications/terminal_display/BUILD.gn
index e2856f6..75b8b3f 100644
--- a/applications/terminal_display/BUILD.gn
+++ b/applications/terminal_display/BUILD.gn
@@ -24,9 +24,9 @@
 
 pw_source_set("text_buffer") {
   public_deps = [
-    "$dir_pw_color",
-    "$dir_pw_math",
     "$dir_pw_result",
+    "$dir_pwexperimental_color",
+    "$dir_pwexperimental_math",
   ]
   sources = [
     "text_buffer.cc",
@@ -40,18 +40,18 @@
     ":text_buffer",
     "$dir_app_common",
     "$dir_pw_board_led",
-    "$dir_pw_color",
     "$dir_pw_containers:vector",
-    "$dir_pw_display",
-    "$dir_pw_draw",
-    "$dir_pw_framebuffer",
     "$dir_pw_log",
-    "$dir_pw_math",
     "$dir_pw_random",
     "$dir_pw_ring_buffer",
     "$dir_pw_spin_delay",
     "$dir_pw_string",
     "$dir_pw_sys_io",
+    "$dir_pwexperimental_color",
+    "$dir_pwexperimental_display",
+    "$dir_pwexperimental_draw",
+    "$dir_pwexperimental_framebuffer",
+    "$dir_pwexperimental_math",
   ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
 
@@ -80,8 +80,8 @@
 pw_test("text_buffer_test") {
   deps = [
     ":text_buffer",
-    "$dir_pw_color",
     "$dir_pw_unit_test",
+    "$dir_pwexperimental_color",
   ]
   sources = [ "text_buffer_test.cc" ]
 }
diff --git a/modules.gni b/modules.gni
index 74ca546..b3a1942 100644
--- a/modules.gni
+++ b/modules.gni
@@ -28,35 +28,38 @@
       get_path_info("pw_board_led_stm32f769i_disc0", "abspath")
   dir_pw_board_led_stm32cube =
       get_path_info("pw_board_led_stm32cube", "abspath")
-  dir_pw_color = get_path_info("pw_graphics/pw_color", "abspath")
-  dir_pw_math = get_path_info("pw_graphics/pw_math", "abspath")
+  dir_pwexperimental_color = get_path_info("pw_graphics/pw_color", "abspath")
+  dir_pwexperimental_math = get_path_info("pw_graphics/pw_math", "abspath")
   dir_pw_digital_io_arduino = get_path_info("pw_digital_io_arduino", "abspath")
   dir_pw_digital_io_stm32cube =
       get_path_info("pw_digital_io_stm32cube", "abspath")
-  dir_pw_display = get_path_info("pw_graphics/pw_display", "abspath")
-  dir_pw_display_driver = get_path_info("pw_display_driver", "abspath")
-  dir_pw_display_driver_ili9341 =
+  dir_pwexperimental_display =
+      get_path_info("pw_graphics/pw_display", "abspath")
+  dir_pwexperimental_display_driver =
+      get_path_info("pw_display_driver", "abspath")
+  dir_pwexperimental_display_driver_ili9341 =
       get_path_info("pw_display_driver_ili9341", "abspath")
-  dir_pw_display_driver_imgui =
+  dir_pwexperimental_display_driver_imgui =
       get_path_info("pw_display_driver_imgui", "abspath")
-  dir_pw_display_driver_mipi_dsi =
+  dir_pwexperimental_display_driver_mipi_dsi =
       get_path_info("pw_display_driver_mipi", "abspath")
-  dir_pw_display_driver_null =
+  dir_pwexperimental_display_driver_null =
       get_path_info("pw_display_driver_null", "abspath")
-  dir_pw_display_driver_st7735 =
+  dir_pwexperimental_display_driver_st7735 =
       get_path_info("pw_display_driver_st7735", "abspath")
-  dir_pw_display_driver_st7789 =
+  dir_pwexperimental_display_driver_st7789 =
       get_path_info("pw_display_driver_st7789", "abspath")
-  dir_pw_display_imgui =
+  dir_pwexperimental_display_imgui =
       get_path_info("pw_graphics/pw_display_imgui", "abspath")
-  dir_pw_draw = get_path_info("pw_graphics/pw_draw", "abspath")
-  dir_pw_framebuffer = get_path_info("pw_graphics/pw_framebuffer", "abspath")
-  dir_pw_framebuffer_pool =
+  dir_pwexperimental_draw = get_path_info("pw_graphics/pw_draw", "abspath")
+  dir_pwexperimental_framebuffer =
+      get_path_info("pw_graphics/pw_framebuffer", "abspath")
+  dir_pwexperimental_framebuffer_pool =
       get_path_info("pw_graphics/pw_framebuffer_pool", "abspath")
-  dir_pw_framebuffer_pool_mcuxpresso =
+  dir_pwexperimental_framebuffer_pool_mcuxpresso =
       get_path_info("pw_graphics/pw_framebuffer_pool_mcuxpresso", "abspath")
-  dir_pw_mipi_dsi = get_path_info("pw_mipi_dsi", "abspath")
-  dir_pw_mipi_dsi_mcuxpresso =
+  dir_pwexperimental_mipi_dsi = get_path_info("pw_mipi_dsi", "abspath")
+  dir_pwexperimental_mipi_dsi_mcuxpresso =
       get_path_info("pw_mipi_dsi_mcuxpresso", "abspath")
   dir_pw_spi_arduino = get_path_info("pw_spi_arduino", "abspath")
   dir_pw_spi_stm32cube = get_path_info("pw_spi_stm32cube", "abspath")
@@ -75,8 +78,8 @@
   dir_pw_sys_io_baremetal_stm32f769 =
       get_path_info("pw_sys_io_baremetal_stm32f769", "abspath")
   dir_pw_toolchain_extra = get_path_info("pw_toolchain_extra", "abspath")
-  dir_pw_pixel_pusher = get_path_info("pw_pixel_pusher", "abspath")
-  dir_pw_pixel_pusher_rp2040_pio =
+  dir_pwexperimental_pixel_pusher = get_path_info("pw_pixel_pusher", "abspath")
+  dir_pwexperimental_pixel_pusher_rp2040_pio =
       get_path_info("pw_pixel_pusher_rp2040_pio", "abspath")
   pw_dir_third_party_32blit = get_path_info("third_party/32blit", "abspath")
 }
diff --git a/pw_display_driver/BUILD.gn b/pw_display_driver/BUILD.gn
index 20082c9..34f63b2 100644
--- a/pw_display_driver/BUILD.gn
+++ b/pw_display_driver/BUILD.gn
@@ -31,10 +31,10 @@
   public_configs = [ ":public_include_path" ]
   public = [ "public/pw_display_driver/display_driver.h" ]
   public_deps = [
-    "$dir_pw_framebuffer",
     "$dir_pw_function",
     "$dir_pw_span",
     "$dir_pw_status",
+    "$dir_pwexperimental_framebuffer",
   ]
 }
 
diff --git a/pw_display_driver_ili9341/BUILD.gn b/pw_display_driver_ili9341/BUILD.gn
index e9c90d0..5eef413 100644
--- a/pw_display_driver_ili9341/BUILD.gn
+++ b/pw_display_driver_ili9341/BUILD.gn
@@ -41,10 +41,10 @@
   ]
   public_deps = [
     "$dir_pw_digital_io",
-    "$dir_pw_display_driver:display_driver",
-    "$dir_pw_framebuffer_pool",
-    "$dir_pw_pixel_pusher:pixel_pusher",
     "$dir_pw_spi:device",
+    "$dir_pwexperimental_display_driver:display_driver",
+    "$dir_pwexperimental_framebuffer_pool",
+    "$dir_pwexperimental_pixel_pusher:pixel_pusher",
   ]
   sources = [ "display_driver.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
diff --git a/pw_display_driver_imgui/BUILD.gn b/pw_display_driver_imgui/BUILD.gn
index 156e95e..8f679bd 100644
--- a/pw_display_driver_imgui/BUILD.gn
+++ b/pw_display_driver_imgui/BUILD.gn
@@ -30,11 +30,11 @@
     "$dir_pigweed_experimental/third_party/glfw",
     "$dir_pigweed_experimental/third_party/imgui",
     "$dir_pw_log",
-    "$dir_pw_math",
+    "$dir_pwexperimental_math",
   ]
   public_deps = [
-    "$dir_pw_display_driver:display_driver",
-    "$dir_pw_framebuffer_pool",
+    "$dir_pwexperimental_display_driver:display_driver",
+    "$dir_pwexperimental_framebuffer_pool",
   ]
   sources = [ "display_driver.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
diff --git a/pw_display_driver_mipi/BUILD.gn b/pw_display_driver_mipi/BUILD.gn
index 60db1de..6228daf 100644
--- a/pw_display_driver_mipi/BUILD.gn
+++ b/pw_display_driver_mipi/BUILD.gn
@@ -25,11 +25,11 @@
   public = [ "public/pw_display_driver_mipi/display_driver.h" ]
   deps = [ "$dir_pw_log" ]
   public_deps = [
-    "$dir_pw_display_driver:display_driver",
-    "$dir_pw_math",
-    "$dir_pw_mipi_dsi",
     "$dir_pw_spi:device",
     "$dir_pw_status",
+    "$dir_pwexperimental_display_driver:display_driver",
+    "$dir_pwexperimental_math",
+    "$dir_pwexperimental_mipi_dsi",
   ]
   sources = [ "display_driver.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
diff --git a/pw_display_driver_null/BUILD.gn b/pw_display_driver_null/BUILD.gn
index 182c50b..e84150e 100644
--- a/pw_display_driver_null/BUILD.gn
+++ b/pw_display_driver_null/BUILD.gn
@@ -23,6 +23,6 @@
 pw_source_set("pw_display_driver_null") {
   public_configs = [ ":default_config" ]
   public = [ "public/pw_display_driver_null/display_driver.h" ]
-  public_deps = [ "$dir_pw_display_driver:display_driver" ]
+  public_deps = [ "$dir_pwexperimental_display_driver:display_driver" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
 }
diff --git a/pw_display_driver_st7735/BUILD.gn b/pw_display_driver_st7735/BUILD.gn
index 63c6866..b47aa3b 100644
--- a/pw_display_driver_st7735/BUILD.gn
+++ b/pw_display_driver_st7735/BUILD.gn
@@ -29,8 +29,8 @@
   ]
   public_deps = [
     "$dir_pw_digital_io",
-    "$dir_pw_display_driver:display_driver",
     "$dir_pw_spi:device",
+    "$dir_pwexperimental_display_driver:display_driver",
   ]
   sources = [ "display_driver.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
diff --git a/pw_display_driver_st7789/BUILD.gn b/pw_display_driver_st7789/BUILD.gn
index 5800337..e2859e4 100644
--- a/pw_display_driver_st7789/BUILD.gn
+++ b/pw_display_driver_st7789/BUILD.gn
@@ -29,9 +29,9 @@
   ]
   public_deps = [
     "$dir_pw_digital_io",
-    "$dir_pw_display_driver:display_driver",
-    "$dir_pw_pixel_pusher:pixel_pusher",
     "$dir_pw_spi:device",
+    "$dir_pwexperimental_display_driver:display_driver",
+    "$dir_pwexperimental_pixel_pusher:pixel_pusher",
   ]
   sources = [ "display_driver.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]
diff --git a/pw_graphics/pw_display/BUILD.gn b/pw_graphics/pw_display/BUILD.gn
index 2adcab2..1d81923 100644
--- a/pw_graphics/pw_display/BUILD.gn
+++ b/pw_graphics/pw_display/BUILD.gn
@@ -37,14 +37,14 @@
     ":build_config",
   ]
   public = [ "public/pw_display/display.h" ]
-  deps = [ "$dir_pw_color" ]
+  deps = [ "$dir_pwexperimental_color" ]
   public_deps = [
     "$dir_pw_assert",
-    "$dir_pw_display_driver:display_driver",
-    "$dir_pw_framebuffer",
-    "$dir_pw_framebuffer_pool",
-    "$dir_pw_math",
     "$dir_pw_status",
+    "$dir_pwexperimental_display_driver:display_driver",
+    "$dir_pwexperimental_framebuffer",
+    "$dir_pwexperimental_framebuffer_pool",
+    "$dir_pwexperimental_math",
   ]
   sources = [ "display.cc" ]
 }
@@ -52,7 +52,7 @@
 pw_test("display_test") {
   deps = [
     ":pw_display",
-    "$dir_pw_color",
+    "$dir_pwexperimental_color",
   ]
   sources = [ "display_test.cc" ]
 }
diff --git a/pw_graphics/pw_display_imgui/BUILD.gn b/pw_graphics/pw_display_imgui/BUILD.gn
index b05a0a0..f7422b5 100644
--- a/pw_graphics/pw_display_imgui/BUILD.gn
+++ b/pw_graphics/pw_display_imgui/BUILD.gn
@@ -23,11 +23,11 @@
   public_configs = [ ":public_includes" ]
   public = [ "public/pw_display_imgui/display.h" ]
   public_deps = [
-    "$dir_pw_display",
-    "$dir_pw_display_driver_imgui",
-    "$dir_pw_framebuffer",
-    "$dir_pw_math",
     "$dir_pw_status",
+    "$dir_pwexperimental_display",
+    "$dir_pwexperimental_display_driver_imgui",
+    "$dir_pwexperimental_framebuffer",
+    "$dir_pwexperimental_math",
   ]
   sources = [ "display.cc" ]
 
diff --git a/pw_graphics/pw_draw/BUILD.gn b/pw_graphics/pw_draw/BUILD.gn
index f53beba..9d375e6 100644
--- a/pw_graphics/pw_draw/BUILD.gn
+++ b/pw_graphics/pw_draw/BUILD.gn
@@ -38,9 +38,9 @@
     "text_area.cc",
   ]
   public_deps = [
-    "$dir_pw_color",
-    "$dir_pw_framebuffer",
-    "$dir_pw_math",
+    "$dir_pwexperimental_color",
+    "$dir_pwexperimental_framebuffer",
+    "$dir_pwexperimental_math",
   ]
 }
 
diff --git a/pw_graphics/pw_framebuffer/BUILD.gn b/pw_graphics/pw_framebuffer/BUILD.gn
index c753bb7..6f1616b 100644
--- a/pw_graphics/pw_framebuffer/BUILD.gn
+++ b/pw_graphics/pw_framebuffer/BUILD.gn
@@ -26,9 +26,9 @@
   public_configs = [ ":default_config" ]
   deps = [ "$dir_pw_assert" ]
   public_deps = [
-    "$dir_pw_color",
-    "$dir_pw_math",
     "$dir_pw_result",
+    "$dir_pwexperimental_color",
+    "$dir_pwexperimental_math",
   ]
   public = [
     "public/pw_framebuffer/framebuffer.h",
diff --git a/pw_graphics/pw_framebuffer_pool/BUILD.gn b/pw_graphics/pw_framebuffer_pool/BUILD.gn
index bbc39fe..185baf7 100644
--- a/pw_graphics/pw_framebuffer_pool/BUILD.gn
+++ b/pw_graphics/pw_framebuffer_pool/BUILD.gn
@@ -25,14 +25,14 @@
   public = [ "public/pw_framebuffer_pool/framebuffer_pool.h" ]
   deps = [
     "$dir_pw_assert",
-    "$dir_pw_color",
+    "$dir_pwexperimental_color",
   ]
   public_deps = [
     "$dir_pw_containers",
-    "$dir_pw_framebuffer",
-    "$dir_pw_math",
     "$dir_pw_status",
     "$dir_pw_sync:counting_semaphore",
+    "$dir_pwexperimental_framebuffer",
+    "$dir_pwexperimental_math",
   ]
   sources = [ "framebuffer_pool.cc" ]
 }
diff --git a/pw_graphics/pw_framebuffer_pool_mcuxpresso/BUILD.gn b/pw_graphics/pw_framebuffer_pool_mcuxpresso/BUILD.gn
index c3f410c..20f86fa 100644
--- a/pw_graphics/pw_framebuffer_pool_mcuxpresso/BUILD.gn
+++ b/pw_graphics/pw_framebuffer_pool_mcuxpresso/BUILD.gn
@@ -24,8 +24,8 @@
   public_configs = [ ":default_config" ]
   public = [ "public/pw_framebuffer_pool_mcuxpresso/framebuffer_pool.h" ]
   public_deps = [
-    "$dir_pw_framebuffer_pool",
-    "$dir_pw_mipi_dsi",
+    "$dir_pwexperimental_framebuffer_pool",
+    "$dir_pwexperimental_mipi_dsi",
   ]
   sources = [ "framebuffer_pool.cc" ]
 }
diff --git a/pw_mipi_dsi/BUILD.gn b/pw_mipi_dsi/BUILD.gn
index 32ec0f8..da674e1 100644
--- a/pw_mipi_dsi/BUILD.gn
+++ b/pw_mipi_dsi/BUILD.gn
@@ -26,9 +26,9 @@
   public_configs = [ ":public_include_path" ]
   public = [ "public/pw_mipi_dsi/device.h" ]
   public_deps = [
-    "$dir_pw_framebuffer",
     "$dir_pw_function",
     "$dir_pw_status",
+    "$dir_pwexperimental_framebuffer",
   ]
 }
 
diff --git a/pw_mipi_dsi_mcuxpresso/BUILD.gn b/pw_mipi_dsi_mcuxpresso/BUILD.gn
index 77b9616..b46b100 100644
--- a/pw_mipi_dsi_mcuxpresso/BUILD.gn
+++ b/pw_mipi_dsi_mcuxpresso/BUILD.gn
@@ -37,12 +37,12 @@
     "public/pw_mipi_dsi_mcuxpresso/framebuffer_device.h",
   ]
   public_deps = [
-    "$dir_pw_color",
-    "$dir_pw_framebuffer",
-    "$dir_pw_framebuffer_pool",
-    "$dir_pw_mipi_dsi",
     "$dir_pw_status",
     "$dir_pw_sync:counting_semaphore",
+    "$dir_pwexperimental_color",
+    "$dir_pwexperimental_framebuffer",
+    "$dir_pwexperimental_framebuffer_pool",
+    "$dir_pwexperimental_mipi_dsi",
     "$pw_third_party_mcuxpresso_SDK",
   ]
   deps = [
diff --git a/pw_pixel_pusher/BUILD.gn b/pw_pixel_pusher/BUILD.gn
index 8266621..5811f93 100644
--- a/pw_pixel_pusher/BUILD.gn
+++ b/pw_pixel_pusher/BUILD.gn
@@ -30,9 +30,9 @@
   public = [ "public/pw_pixel_pusher/pixel_pusher.h" ]
   public_deps = [
     "$dir_pw_bytes",
-    "$dir_pw_framebuffer",
-    "$dir_pw_framebuffer_pool",
     "$dir_pw_span",
     "$dir_pw_status",
+    "$dir_pwexperimental_framebuffer",
+    "$dir_pwexperimental_framebuffer_pool",
   ]
 }
diff --git a/pw_pixel_pusher_rp2040_pio/BUILD.gn b/pw_pixel_pusher_rp2040_pio/BUILD.gn
index 6b358d2..e4aa52e 100644
--- a/pw_pixel_pusher_rp2040_pio/BUILD.gn
+++ b/pw_pixel_pusher_rp2040_pio/BUILD.gn
@@ -32,9 +32,9 @@
     "$PICO_ROOT/src/rp2_common/hardware_pio",
     "$PICO_ROOT/src/rp2_common/hardware_spi",
     "$dir_pw_digital_io",
-    "$dir_pw_framebuffer_pool",
-    "$dir_pw_pixel_pusher:pixel_pusher",
     "$dir_pw_sync:binary_semaphore",
+    "$dir_pwexperimental_framebuffer_pool",
+    "$dir_pwexperimental_pixel_pusher:pixel_pusher",
   ]
   sources = [ "pixel_pusher.cc" ]
   remove_configs = [ "$dir_pw_build:strict_warnings" ]