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 21319f7ee48d..d83e8010b3f1 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,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -16,6 +16,7 @@
 package com.intellij.lang.java;
 
 import com.intellij.lang.Language;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author max
@@ -28,6 +29,7 @@ public class JavaLanguage extends Language {
     super("JAVA", "text/java", "application/x-java", "text/x-java");
   }
 
+  @NotNull
   @Override
   public String getDisplayName() {
     return "Java";
diff --git a/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextLanguage.java b/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextLanguage.java
index 8496804ec81d..43f9c0b2bbfc 100644
--- a/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextLanguage.java
+++ b/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -17,6 +17,7 @@
 package com.intellij.openapi.fileTypes;
 
 import com.intellij.lang.Language;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Maxim.Mossienko
@@ -29,6 +30,7 @@ public class PlainTextLanguage extends Language {
     super("TEXT", "text/plain");
   }
 
+  @NotNull
   @Override
   public String getDisplayName() {
     return "Plain text";
diff --git a/platform/lang-api/src/com/intellij/psi/injection/Injectable.java b/platform/lang-api/src/com/intellij/psi/injection/Injectable.java
index 717414aaf380..f09022e0dc03 100644
--- a/platform/lang-api/src/com/intellij/psi/injection/Injectable.java
+++ b/platform/lang-api/src/com/intellij/psi/injection/Injectable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -59,6 +59,7 @@ public abstract class Injectable implements Comparable<Injectable> {
 
   public Language toLanguage() {
     return getLanguage() == null ? new Language(getId(), false) {
+      @NotNull
       @Override
       public String getDisplayName() {
         return Injectable.this.getDisplayName();
diff --git a/python/rest/src/com/jetbrains/rest/RestLanguage.java b/python/rest/src/com/jetbrains/rest/RestLanguage.java
index df056590efcc..a29e2efdf7ec 100644
--- a/python/rest/src/com/jetbrains/rest/RestLanguage.java
+++ b/python/rest/src/com/jetbrains/rest/RestLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -18,6 +18,7 @@ package com.jetbrains.rest;
 import com.intellij.lang.Language;
 import com.intellij.psi.templateLanguages.TemplateLanguage;
 import com.jetbrains.rest.validation.*;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -32,6 +33,7 @@ public class RestLanguage extends Language implements TemplateLanguage  {
     super("ReST");
   }
 
+  @NotNull
   @Override
   public String getDisplayName() {
     return "Rest language";
diff --git a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgLanguage.java b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgLanguage.java
index 74cccaea12a7..446f3d507453 100644
--- a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgLanguage.java
+++ b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -37,6 +37,7 @@ public class BuildoutCfgLanguage extends Language {
     });
   }
 
+  @NotNull
   @Override
   public String getDisplayName() {
     return "Buildout config";