diff --git a/java/java-psi-api/src/com/intellij/lang/java/JavaLanguage.java b/java/java-psi-api/src/com/intellij/lang/java/JavaLanguage.java
index cbd240b2ac3b..5d1027d62f3c 100644
--- a/java/java-psi-api/src/com/intellij/lang/java/JavaLanguage.java
+++ b/java/java-psi-api/src/com/intellij/lang/java/JavaLanguage.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.lang.java;
 
 import com.intellij.lang.Language;
+import com.intellij.lang.jvm.JvmLanguage;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * @author max
  */
-public class JavaLanguage extends Language {
+public class JavaLanguage extends Language implements JvmLanguage {
 
   @NotNull
   public static final JavaLanguage INSTANCE = new JavaLanguage();
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyLanguage.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyLanguage.kt
index 82b9e7b2faf2..45c349f67f5d 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyLanguage.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyLanguage.kt
@@ -1,29 +1,16 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.plugins.groovy
 
 import com.intellij.lang.Language
+import com.intellij.lang.jvm.JvmLanguage
 
 /**
  * All main properties for Groovy language
  *
  * @author ilyas
  */
-object GroovyLanguage : Language("Groovy") {
+object GroovyLanguage : Language("Groovy"), JvmLanguage {
 
   override fun isCaseSensitive() = true
 }