diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3aac6b371c..5fbf730b5c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,10 +15,10 @@
 /tests/modules/javascript                   @aristath @gziolo
 /tests/testdata/modules/javascript          @aristath @gziolo
 
-# Focus: Object Caching
-/modules/object-caching                     @tillkruss @dustinrue
-/tests/modules/object-caching               @tillkruss @dustinrue
-/tests/testdata/modules/object-caching      @tillkruss @dustinrue
+# Focus: Object Cache
+/modules/object-cache                       @tillkruss @spacedmonkey
+/tests/modules/object-cache                 @tillkruss @spacedmonkey
+/tests/testdata/modules/object-cache        @tillkruss @spacedmonkey
 
 # Focus: Measurement
 /modules/measurement                        @AymenLoukil @josephscott
diff --git a/admin/load.php b/admin/load.php
index ece2922da4..6d4a17e30d 100644
--- a/admin/load.php
+++ b/admin/load.php
@@ -167,20 +167,20 @@ function perflab_render_modules_page_field( $module_slug, $module_data, $module_
  */
 function perflab_get_focus_areas() {
 	return array(
-		'images'         => array(
+		'images'       => array(
 			'name' => __( 'Images', 'performance-lab' ),
 		),
-		'javascript'     => array(
+		'javascript'   => array(
 			'name' => __( 'JavaScript', 'performance-lab' ),
 		),
-		'site-health'    => array(
+		'site-health'  => array(
 			'name' => __( 'Site Health', 'performance-lab' ),
 		),
-		'measurement'    => array(
+		'measurement'  => array(
 			'name' => __( 'Measurement', 'performance-lab' ),
 		),
-		'object-caching' => array(
-			'name' => __( 'Object caching', 'performance-lab' ),
+		'object-cache' => array(
+			'name' => __( 'Object Cache', 'performance-lab' ),
 		),
 	);
 }
diff --git a/tests/admin/load-tests.php b/tests/admin/load-tests.php
index 9e70b48bb8..c33adac3fa 100644
--- a/tests/admin/load-tests.php
+++ b/tests/admin/load-tests.php
@@ -32,20 +32,20 @@ class Admin_Load_Tests extends WP_UnitTestCase {
 	);
 
 	private static $demo_focus_areas = array(
-		'images'         => array(
+		'images'       => array(
 			'name' => 'Images',
 		),
-		'javascript'     => array(
+		'javascript'   => array(
 			'name' => 'JavaScript',
 		),
-		'site-health'    => array(
+		'site-health'  => array(
 			'name' => 'Site Health',
 		),
-		'measurement'    => array(
+		'measurement'  => array(
 			'name' => 'Measurement',
 		),
-		'object-caching' => array(
-			'name' => 'Object caching',
+		'object-cache' => array(
+			'name' => 'Object Cache',
 		),
 	);
 
@@ -181,7 +181,7 @@ public function test_perflab_get_focus_areas() {
 			'javascript',
 			'site-health',
 			'measurement',
-			'object-caching',
+			'object-cache',
 		);
 		$this->assertSame( $expected_focus_areas, array_keys( perflab_get_focus_areas() ) );
 	}