diff --git a/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateServiceImpl.java b/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateServiceImpl.java
index 2b71339a198a..dbda3c57d011 100644
--- a/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateServiceImpl.java
+++ b/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateServiceImpl.java
@@ -204,7 +204,7 @@ public class TextMateServiceImpl extends TextMateService {
   @Override
   @Nullable
   public TextMateLanguageDescriptor getLanguageDescriptorByFileName(@NotNull String fileName) {
-    for (String extension : getExtensions(StringUtil.toLowerCase(fileName))) {
+    for (String extension : getExtensions(fileName)) {
       final TextMateLanguageDescriptor languageDescriptor = getLanguageDescriptorByExtension(extension);
       if (languageDescriptor != null) {
         return languageDescriptor;
@@ -432,7 +432,7 @@ public class TextMateServiceImpl extends TextMateService {
     for (String extension : extensions) {
       FileType registeredType = fileTypeManager.getFileTypeByFileName(extension);
       if (isTypeShouldBeReplacedByTextMateType(registeredType)) {
-        matchers.add(new ExactFileNameMatcher(extension, true));
+        matchers.add(FileTypeManager.parseFromString(extension));
       }
 
       registeredType = fileTypeManager.getFileTypeByExtension(extension);
diff --git a/plugins/textmate/src/org/jetbrains/plugins/textmate/bundles/VSCBundle.java b/plugins/textmate/src/org/jetbrains/plugins/textmate/bundles/VSCBundle.java
index 1c6786761751..fabedd462b4c 100644
--- a/plugins/textmate/src/org/jetbrains/plugins/textmate/bundles/VSCBundle.java
+++ b/plugins/textmate/src/org/jetbrains/plugins/textmate/bundles/VSCBundle.java
@@ -67,7 +67,7 @@ public class VSCBundle extends Bundle {
                   }
                   Object filenames = ((Map)language).get("filenames");
                   if (filenames instanceof ArrayList) {
-                    idToExtension.put((String)id, ContainerUtil.map((ArrayList)filenames, (filename) -> filename));
+                    idToExtension.put((String)id, (ArrayList)filenames);
                   }
                   Object configuration = ((Map)language).get("configuration");
                   if (configuration instanceof String) {