diff --git a/plugins/extension/finder/finder.php b/plugins/extension/finder/finder.php
index 8ae79ae82a068..93b94d9e4eff3 100644
--- a/plugins/extension/finder/finder.php
+++ b/plugins/extension/finder/finder.php
@@ -72,13 +72,12 @@ public function onExtensionAfterUpdate($installer, $eid)
 	 *
 	 * @since   4.0.0
 	 */
-	public function onExtensionBeforeUninstall($installer, $eid, $removed)
+	public function onExtensionAfterUninstall($installer, $eid, $removed)
 	{
-		$extension = $this->getLanguage($eid);
-
-		if ($extension)
+		// Check that the language was successfully uninstalled.
+		if ($eid && $removed && $installer->extension->type === 'language')
 		{
-			$this->removeCommonWords($extension);
+			$this->removeCommonWords($installer->extension);
 		}
 	}
 
diff --git a/tests/Unit/Libraries/Cms/Mircodata/MicrodataTest.php b/tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php
similarity index 100%
rename from tests/Unit/Libraries/Cms/Mircodata/MicrodataTest.php
rename to tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php