diff --git a/src/I18n/MessagesFileLoader.php b/src/I18n/MessagesFileLoader.php
index abcd592f3fa..3dc228b63be 100644
--- a/src/I18n/MessagesFileLoader.php
+++ b/src/I18n/MessagesFileLoader.php
@@ -108,8 +108,13 @@ public function __invoke() {
 		$ext = $this->_extension;
 		$file = false;
 
+		$fileName = $this->_name;
+		$pos = strpos($fileName, '/');
+		if ($pos !== false) {
+			$fileName = substr($fileName, $pos + 1);
+		}
 		foreach ($folders as $folder) {
-			$path = $folder . str_replace('/', '_', $this->_name) . ".$ext";
+			$path = $folder . $fileName . ".$ext";
 			if (is_file($path)) {
 				$file = $path;
 				break;
diff --git a/tests/test_app/Plugin/Company/TestPluginThree/src/Locale/en/company_test_plugin_three.po b/tests/test_app/Plugin/Company/TestPluginThree/src/Locale/en/test_plugin_three.po
similarity index 100%
rename from tests/test_app/Plugin/Company/TestPluginThree/src/Locale/en/company_test_plugin_three.po
rename to tests/test_app/Plugin/Company/TestPluginThree/src/Locale/en/test_plugin_three.po