diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index dcee9a5b4..0401b9f45 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -190,7 +190,7 @@
 	<!-- Flags calls to get_*_meta() and get_metadata*() functions
 	     that include the $[meta_]key parameter but omit the $single parameter.
 	     https://github.com/WordPress/WordPress-Coding-Standards/issues/2459 -->
-	<rule ref="WordPress.WP.GetMetaFunctionSingleParameter"/>
+	<rule ref="WordPress.WP.GetMetaSingle"/>
 
 	<!--
 	#############################################################################
diff --git a/WordPress/Docs/WP/GetMetaFunctionSingleParameterStandard.xml b/WordPress/Docs/WP/GetMetaFunctionSingleParameterStandard.xml
index 123fa70a8..1be1bbc8e 100644
--- a/WordPress/Docs/WP/GetMetaFunctionSingleParameterStandard.xml
+++ b/WordPress/Docs/WP/GetMetaFunctionSingleParameterStandard.xml
@@ -8,6 +8,8 @@
     When calling the `get_(comment|post|site|term|user)_meta()`, `get_metadata()`,
     `get_metadata_default()`, and `get_metadata_raw()` functions, if the `$[meta_]key` parameter is
     passed, the `$single` parameter should be passed as well to make it explicit whether the functions should return a single value (the first value) or an array of values stored for the meta key.
+
+    Note that these functions may still return `false` for an invalid ID. They may also return an empty string if `$single` is `true` or an empty array if `$single` is `false` for a valid but non-existing ID. This can be confusing as these might be valid values for a meta value.
     ]]>
     </standard>
     <code_comparison>
diff --git a/WordPress/Sniffs/WP/GetMetaFunctionSingleParameterSniff.php b/WordPress/Sniffs/WP/GetMetaSingleSniff.php
similarity index 98%
rename from WordPress/Sniffs/WP/GetMetaFunctionSingleParameterSniff.php
rename to WordPress/Sniffs/WP/GetMetaSingleSniff.php
index 30efe9a79..304b6f8ca 100644
--- a/WordPress/Sniffs/WP/GetMetaFunctionSingleParameterSniff.php
+++ b/WordPress/Sniffs/WP/GetMetaSingleSniff.php
@@ -24,7 +24,7 @@
  *
  * @since 3.2.0
  */
-final class GetMetaFunctionSingleParameterSniff extends AbstractFunctionParameterSniff {
+final class GetMetaSingleSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * The group name for this group of functions.
diff --git a/WordPress/Tests/WP/GetMetaFunctionSingleParameterUnitTest.inc b/WordPress/Tests/WP/GetMetaSingleUnitTest.inc
similarity index 100%
rename from WordPress/Tests/WP/GetMetaFunctionSingleParameterUnitTest.inc
rename to WordPress/Tests/WP/GetMetaSingleUnitTest.inc
diff --git a/WordPress/Tests/WP/GetMetaFunctionSingleParameterUnitTest.php b/WordPress/Tests/WP/GetMetaSingleUnitTest.php
similarity index 80%
rename from WordPress/Tests/WP/GetMetaFunctionSingleParameterUnitTest.php
rename to WordPress/Tests/WP/GetMetaSingleUnitTest.php
index b1582c6a5..f1b328c39 100644
--- a/WordPress/Tests/WP/GetMetaFunctionSingleParameterUnitTest.php
+++ b/WordPress/Tests/WP/GetMetaSingleUnitTest.php
@@ -12,13 +12,13 @@
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
 /**
- * Unit test class for the GetMetaFunctionSingleParameter sniff.
+ * Unit test class for the GetMetaSingle sniff.
  *
  * @since 3.2.0
  *
- * @covers \WordPressCS\WordPress\Sniffs\WP\GetMetaFunctionSingleParameterSniff
+ * @covers \WordPressCS\WordPress\Sniffs\WP\GetMetaSingleSniff
  */
-final class GetMetaFunctionSingleParameterUnitTest extends AbstractSniffUnitTest {
+final class GetMetaSingleUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.