diff --git a/includes/admin/class-wc-admin-api-keys-table-list.php b/includes/admin/class-wc-admin-api-keys-table-list.php
index c12bfae8629..e70b5e10027 100644
--- a/includes/admin/class-wc-admin-api-keys-table-list.php
+++ b/includes/admin/class-wc-admin-api-keys-table-list.php
@@ -186,7 +186,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 	public function prepare_items() {
 		global $wpdb;
 
-		$per_page     = $this->get_items_per_page( 'wc_keys_per_page' );
+		$per_page     = $this->get_items_per_page( 'woocommerce_keys_per_page' );
 		$current_page = $this->get_pagenum();
 
 		if ( 1 < $current_page ) {
diff --git a/includes/admin/class-wc-admin-api-keys.php b/includes/admin/class-wc-admin-api-keys.php
index 85ea2de160e..7455e60719c 100644
--- a/includes/admin/class-wc-admin-api-keys.php
+++ b/includes/admin/class-wc-admin-api-keys.php
@@ -59,7 +59,7 @@ class WC_Admin_API_Keys {
 			// Add screen option.
 			add_screen_option( 'per_page', array(
 				'default' => 10,
-				'option'  => 'wc_api_keys_per_page',
+				'option'  => 'woocommerce_keys_per_page',
 			) );
 		}
 	}
diff --git a/includes/admin/class-wc-admin-menus.php b/includes/admin/class-wc-admin-menus.php
index 2332a53d08b..6242e7b5175 100644
--- a/includes/admin/class-wc-admin-menus.php
+++ b/includes/admin/class-wc-admin-menus.php
@@ -227,7 +227,7 @@ class WC_Admin_Menus {
 	 * @param int      $value  The number of rows to use.
 	 */
 	public function set_screen_option( $status, $option, $value ) {
-		if ( in_array( $option, array( 'wc_keys_per_page', 'wc_webhooks_per_page' ), true ) ) {
+		if ( in_array( $option, array( 'woocommerce_keys_per_page', 'woocommerce_webhooks_per_page' ), true ) ) {
 			return $value;
 		}
 
diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php
index 107aa6b3ed3..fffd42702f8 100644
--- a/includes/admin/class-wc-admin-webhooks-table-list.php
+++ b/includes/admin/class-wc-admin-webhooks-table-list.php
@@ -247,7 +247,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
 	 * Prepare table list items.
 	 */
 	public function prepare_items() {
-		$per_page     = $this->get_items_per_page( 'wc_webhooks_per_page' );
+		$per_page     = $this->get_items_per_page( 'woocommerce_webhooks_per_page' );
 		$current_page = $this->get_pagenum();
 
 		// Query args.
diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php
index bf473558258..b3215eef7a8 100644
--- a/includes/admin/class-wc-admin-webhooks.php
+++ b/includes/admin/class-wc-admin-webhooks.php
@@ -278,7 +278,7 @@ class WC_Admin_Webhooks {
 			// Add screen option.
 			add_screen_option( 'per_page', array(
 				'default' => 10,
-				'option'  => 'wc_webhooks_per_page',
+				'option'  => 'woocommerce_webhooks_per_page',
 			) );
 		}
 	}
diff --git a/uninstall.php b/uninstall.php
index d690dfa0084..6cb360ea68c 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -58,7 +58,7 @@ if ( defined( 'WC_REMOVE_ALL_DATA' ) && true === WC_REMOVE_ALL_DATA ) {
 	$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}woocommerce_order_itemmeta" );
 
 	// Delete user meta data.
-	foreach ( array( 'wc_keys_per_page', 'wc_webhooks_per_page' ) as $meta_key ) {
+	foreach ( array( 'woocommerce_keys_per_page', 'woocommerce_webhooks_per_page' ) as $meta_key ) {
 		delete_metadata( 'user', 0, $meta_key, '', true );
 	}