diff --git a/TemplateData.hooks.php b/TemplateData.hooks.php
index ccfc87b7..621f8a3a 100644
--- a/TemplateData.hooks.php
+++ b/TemplateData.hooks.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Hooks for TemplateInfo extension
+ * Hooks for TemplateData extension
  *
  * @file
  * @ingroup Extensions
diff --git a/TemplateData.php b/TemplateData.php
index 0dec3b1a..95e442a1 100644
--- a/TemplateData.php
+++ b/TemplateData.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * TemplateInfo extension.
+ * TemplateData extension.
  *
  * @file
  * @ingroup Extensions
  */
 
 if ( version_compare( $wgVersion, '1.20', '<' ) ) {
-	echo "Extension:TemplateInfo requires MediaWiki 1.20 or higher.\n";
+	echo "Extension:TemplateData requires MediaWiki 1.20 or higher.\n";
 	exit( 1 );
 }
 
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index d41b4ddb..d86182fd 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -21,7 +21,7 @@ class TemplateDataBlob {
 	private $data;
 
 	/**
-	 * @var Status: Cache of TemplateInfo::validate
+	 * @var Status: Cache of TemplateDataBlob::parse
 	 */
 	private $status;
 
@@ -50,7 +50,7 @@ class TemplateDataBlob {
 	 * Parse and validate passed JSON (possibly gzip-compressed) and create a TemplateDataBlob object.
 	 *
 	 * @param string $json
-	 * @return TemplateInfo
+	 * @return TemplateDataBlob
 	 */
 	public static function newFromDatabase( $json ) {
 		// Handle GZIP compression. \037\213 is the header for GZIP files.
diff --git a/tests/TemplateDataBlobTest.php b/tests/TemplateDataBlobTest.php
index 37b371f6..e652e85a 100644
--- a/tests/TemplateDataBlobTest.php
+++ b/tests/TemplateDataBlobTest.php
@@ -394,7 +394,7 @@ class TemplateDataBlobTest extends MediaWikiTestCase {
 		// Compress JSON to trigger the code pass in newFromDatabase that ends
 		// up calling gzdecode().
 		$gzJson = gzencode( '{}' );
-		$templateInfo = TemplateDataBlob::newFromDatabase( $gzJson );
-		$this->assertInstanceOf( 'TemplateDataBlob', $templateInfo );
+		$templateData = TemplateDataBlob::newFromDatabase( $gzJson );
+		$this->assertInstanceOf( 'TemplateDataBlob', $templateData );
 	}
 }