diff --git a/.idea/dictionaries/Nikolay_Krasko.xml b/.idea/dictionaries/Nikolay_Krasko.xml
index 443a097d198..6a3de022080 100644
--- a/.idea/dictionaries/Nikolay_Krasko.xml
+++ b/.idea/dictionaries/Nikolay_Krasko.xml
@@ -2,7 +2,6 @@
   <dictionary name="Nikolay.Krasko">
     <words>
       <w>accessors</w>
-      <w>fqnames</w>
       <w>goto</w>
       <w>kdoc</w>
       <w>memoized</w>
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index 3f1bc34e6c8..0ebc3bb8fff 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -3555,9 +3555,9 @@ The "returned" value of try expression with no finally is either the last expres
                         v.ifnonnull(nonnull);
                         JetType leftType = bindingContext.get(BindingContext.EXPRESSION_TYPE, left);
                         assert leftType != null;
-                        throwNewException("kotlin/TypeCastException", DescriptorRenderer.FQNAMES_IN_TYPES.renderType(leftType) +
+                        throwNewException("kotlin/TypeCastException", DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(leftType) +
                                                                      " cannot be cast to " +
-                                                                     DescriptorRenderer.FQNAMES_IN_TYPES.renderType(rightType));
+                                                                     DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(rightType));
                         v.mark(nonnull);
                     }
                 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java
index 791ffdee52b..d1b34c10ed7 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java
@@ -97,7 +97,7 @@ public abstract class ElementAlternativeSignatureData {
             else {
                 throw new AlternativeSignatureMismatchException(
                         "Return type in alternative signature is missing, while in real signature it is '%s'",
-                        DescriptorRenderer.FQNAMES_IN_TYPES.renderType(originalType));
+                        DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(originalType));
             }
         }
 
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
index bb42be72c0f..12b9b7ac5a8 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
@@ -74,7 +74,7 @@ public class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
     public JetType visitNullableType(@NotNull JetNullableType nullableType, Void aVoid) {
         if (!originalType.isNullable() && typeUsage != TYPE_ARGUMENT) {
             throw new AlternativeSignatureMismatchException("Auto type '%s' is not-null, while type in alternative signature is nullable: '%s'",
-                 DescriptorRenderer.FQNAMES_IN_TYPES.renderType(originalType), nullableType.getText());
+                 DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(originalType), nullableType.getText());
         }
         JetTypeElement innerType = nullableType.getInnerType();
         assert innerType != null : "Syntax error: " + nullableType.getText();
@@ -134,7 +134,7 @@ public class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
 
         if (arguments.size() != type.getTypeArgumentsAsTypes().size()) {
             throw new AlternativeSignatureMismatchException("'%s' type in method signature has %d type arguments, while '%s' in alternative signature has %d of them",
-                 DescriptorRenderer.FQNAMES_IN_TYPES.renderType(originalType), arguments.size(), type.getText(),
+                 DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(originalType), arguments.size(), type.getText(),
                  type.getTypeArgumentsAsTypes().size());
         }
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
index c07730ca21a..d75ffb02754 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
@@ -150,7 +150,8 @@ public class DefaultErrorMessages {
 
         MAP.put(DATA_CLASS_OVERRIDE_CONFLICT, "Function ''{0}'' generated for the data class conflicts with member of supertype ''{1}''", NAME, NAME);
 
-        MAP.put(CANNOT_OVERRIDE_INVISIBLE_MEMBER, "''{0}'' has no access to ''{1}'', so it cannot override it", FQNAMES_IN_TYPES, FQNAMES_IN_TYPES);
+        MAP.put(CANNOT_OVERRIDE_INVISIBLE_MEMBER, "''{0}'' has no access to ''{1}'', so it cannot override it", FQ_NAMES_IN_TYPES,
+                FQ_NAMES_IN_TYPES);
         MAP.put(CANNOT_INFER_VISIBILITY, "Cannot infer visibility. Please specify it explicitly");
 
         MAP.put(ENUM_ENTRY_SHOULD_BE_INITIALIZED, "Missing delegation specifier ''{0}''", NAME);
@@ -162,7 +163,7 @@ public class DefaultErrorMessages {
         MAP.put(UNUSED_PARAMETER, "Parameter ''{0}'' is never used", NAME);
         MAP.put(ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE, "Variable ''{0}'' is assigned but never accessed", NAME);
         MAP.put(VARIABLE_WITH_REDUNDANT_INITIALIZER, "Variable ''{0}'' initializer is redundant", NAME);
-        MAP.put(UNUSED_VALUE, "The value ''{0}'' assigned to ''{1}'' is never used", ELEMENT_TEXT, FQNAMES_IN_TYPES);
+        MAP.put(UNUSED_VALUE, "The value ''{0}'' assigned to ''{1}'' is never used", ELEMENT_TEXT, FQ_NAMES_IN_TYPES);
         MAP.put(UNUSED_CHANGED_VALUE, "The value changed at ''{0}'' is never used", ELEMENT_TEXT);
         MAP.put(UNUSED_EXPRESSION, "The expression is unused");
         MAP.put(UNUSED_FUNCTION_LITERAL, "The function literal is unused. If you mean block, you can use 'run { ... }'");
@@ -284,7 +285,7 @@ public class DefaultErrorMessages {
         MAP.put(CONFLICTING_UPPER_BOUNDS, "Upper bounds of {0} have empty intersection", NAME);
         MAP.put(CONFLICTING_CLASS_OBJECT_UPPER_BOUNDS, "Class object upper bounds of {0} have empty intersection", NAME);
 
-        MAP.put(TOO_MANY_ARGUMENTS, "Too many arguments for {0}", FQNAMES_IN_TYPES);
+        MAP.put(TOO_MANY_ARGUMENTS, "Too many arguments for {0}", FQ_NAMES_IN_TYPES);
 
         MAP.put(CONSTANT_EXPECTED_TYPE_MISMATCH, "An {0} literal does not conform to the expected type {1}", STRING, RENDER_TYPE);
         MAP.put(INTEGER_OVERFLOW, "This operation has led to an overflow");
@@ -375,18 +376,18 @@ public class DefaultErrorMessages {
         MAP.put(CANNOT_CHANGE_ACCESS_PRIVILEGE, "Cannot change access privilege ''{0}'' for ''{1}'' in ''{2}''", TO_STRING, NAME, NAME);
 
         MAP.put(RETURN_TYPE_MISMATCH_ON_OVERRIDE, "Return type of ''{0}'' is not a subtype of the return type of overridden member {1}",
-                NAME, FQNAMES_IN_TYPES);
+                NAME, FQ_NAMES_IN_TYPES);
 
         MAP.put(PROPERTY_TYPE_MISMATCH_ON_OVERRIDE, "Type of ''{0}'' doesn't match to the type of overridden var-property {1}",
-                NAME, FQNAMES_IN_TYPES);
+                NAME, FQ_NAMES_IN_TYPES);
 
-        MAP.put(VAR_OVERRIDDEN_BY_VAL, "Var-property {0} cannot be overridden by val-property {1}", FQNAMES_IN_TYPES, FQNAMES_IN_TYPES);
+        MAP.put(VAR_OVERRIDDEN_BY_VAL, "Var-property {0} cannot be overridden by val-property {1}", FQ_NAMES_IN_TYPES, FQ_NAMES_IN_TYPES);
 
         MAP.put(ABSTRACT_MEMBER_NOT_IMPLEMENTED, "{0} must be declared abstract or implement abstract member {1}", RENDER_CLASS_OR_OBJECT,
-                FQNAMES_IN_TYPES);
+                FQ_NAMES_IN_TYPES);
 
         MAP.put(MANY_IMPL_MEMBER_NOT_IMPLEMENTED, "{0} must override {1} because it inherits many implementations of it",
-                RENDER_CLASS_OR_OBJECT, FQNAMES_IN_TYPES);
+                RENDER_CLASS_OR_OBJECT, FQ_NAMES_IN_TYPES);
 
         MAP.put(CONFLICTING_OVERLOADS, "''{0}'' is already defined in {1}", COMPACT_WITH_MODIFIERS, STRING);
 
@@ -458,15 +459,15 @@ public class DefaultErrorMessages {
 
         String multipleDefaultsMessage = "More than one overridden descriptor declares a default value for ''{0}''. " +
                                          "As the compiler can not make sure these values agree, this is not allowed.";
-        MAP.put(MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES, multipleDefaultsMessage, FQNAMES_IN_TYPES);
-        MAP.put(MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE, multipleDefaultsMessage, FQNAMES_IN_TYPES);
+        MAP.put(MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES, multipleDefaultsMessage, FQ_NAMES_IN_TYPES);
+        MAP.put(MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE, multipleDefaultsMessage, FQ_NAMES_IN_TYPES);
 
         MAP.put(PARAMETER_NAME_CHANGED_ON_OVERRIDE, "The corresponding parameter in the supertype ''{0}'' is named ''{1}''. " +
                                                     "This may cause problems when calling this function with named arguments.", NAME, NAME);
 
         MAP.put(DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES,
                     "Names of the parameter #{1} conflict in the following members of supertypes: ''{0}''. " +
-                    "This may cause problems when calling this function with named arguments.", commaSeparated(FQNAMES_IN_TYPES), TO_STRING);
+                    "This may cause problems when calling this function with named arguments.", commaSeparated(FQ_NAMES_IN_TYPES), TO_STRING);
 
         MAP.put(AMBIGUOUS_ANONYMOUS_TYPE_INFERRED, "Right-hand side has anonymous type. Please specify type explicitly", TO_STRING);
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java
index 20719d4c0c7..0bf808a306e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java
@@ -120,7 +120,7 @@ public class Renderers {
         @NotNull
         @Override
         public String render(@NotNull JetType type) {
-            return DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type);
+            return DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(type);
         }
     };
 
@@ -131,7 +131,7 @@ public class Renderers {
                 public String render(@NotNull Collection<? extends ResolvedCall<?>> argument) {
                     StringBuilder stringBuilder = new StringBuilder("\n");
                     for (ResolvedCall<?> call : argument) {
-                        stringBuilder.append(DescriptorRenderer.FQNAMES_IN_TYPES.render(call.getResultingDescriptor())).append("\n");
+                        stringBuilder.append(DescriptorRenderer.FQ_NAMES_IN_TYPES.render(call.getResultingDescriptor())).append("\n");
                     }
                     return stringBuilder.toString();
                 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
index 966ef0b6de1..977b0cab993 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
@@ -302,7 +302,7 @@ public class DeclarationResolver {
                     for (DeclarationDescriptor declarationDescriptor : descriptors) {
                         for (PsiElement declaration : getDeclarationsByDescriptor(declarationDescriptor)) {
                             assert declaration != null : "Null declaration for descriptor: " + declarationDescriptor + " " +
-                                                         (declarationDescriptor != null ? DescriptorRenderer.FQNAMES_IN_TYPES.render(declarationDescriptor) : "");
+                                                         (declarationDescriptor != null ? DescriptorRenderer.FQ_NAMES_IN_TYPES.render(declarationDescriptor) : "");
                             trace.report(REDECLARATION.on(declaration, declarationDescriptor.getName().asString()));
                         }
                     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java
index 976309a030f..08ace8c4dcb 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java
@@ -111,7 +111,7 @@ public class ForLoopConventionsChecker {
             if (iteratorResolutionResults.isAmbiguity()) {
 //                    StringBuffer stringBuffer = new StringBuffer("Method 'iterator()' is ambiguous for this expression: ");
 //                    for (FunctionDescriptor functionDescriptor : iteratorResolutionResults.getResultingCalls()) {
-//                        stringBuffer.append(DescriptorRendererImpl.FQNAMES_IN_TYPES.render(functionDescriptor)).append(" ");
+//                        stringBuffer.append(DescriptorRenderer.FQ_NAMES_IN_TYPES.render(functionDescriptor)).append(" ");
 //                    }
 //                    errorMessage = stringBuffer.toString();
                 context.trace.report(ITERATOR_AMBIGUITY.on(loopRangeExpression, iteratorResolutionResults.getResultingCalls()));
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java
index 0f3f4e2a400..021a67caadd 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java
@@ -149,7 +149,7 @@ public abstract class AbstractSdkAnnotationsValidityTest extends UsefulTestCase
         private Void visitDeclaration(@NotNull DeclarationDescriptor descriptor) {
             List<String> errors = bindingContext.get(JavaBindingContext.LOAD_FROM_JAVA_SIGNATURE_ERRORS, descriptor);
             if (errors != null) {
-                this.errors.put(DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor), errors);
+                this.errors.put(DescriptorRenderer.FQ_NAMES_IN_TYPES.render(descriptor), errors);
             }
             return null;
         }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java
index 2ea2d5602d1..61da3931a57 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java
@@ -47,7 +47,7 @@ public class ExpectedLoadErrorsUtil {
         for (DeclarationDescriptor descriptor : ContainerUtil.union(expectedErrors.keySet(), actualErrors.keySet())) {
             List<String> actual = actualErrors.get(descriptor);
             List<String> expected = expectedErrors.get(descriptor);
-            String rendered = DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor);
+            String rendered = DescriptorRenderer.FQ_NAMES_IN_TYPES.render(descriptor);
 
             assertNotNull("Unexpected load error(s):\n" + actual + "\ncontainer:" + rendered, expected);
             assertNotNull("Missing load error(s):\n" + expected + "\ncontainer:" + rendered, actual);
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java
index 3d42b702a17..49a16fc3129 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java
@@ -154,7 +154,7 @@ public abstract class AbstractLazyResolveDescriptorRendererTest extends KotlinTe
             if (renderedDescriptors.length() != 0) {
                 renderedDescriptors.append("\n");
             }
-            renderedDescriptors.append(DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor));
+            renderedDescriptors.append(DescriptorRenderer.FQ_NAMES_IN_TYPES.render(descriptor));
         }
 
         Document document = new DocumentImpl(psiFile.getText());
diff --git a/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java
index 3fa3021e7eb..3199c39909c 100644
--- a/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java
+++ b/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java
@@ -120,7 +120,7 @@ public class DescriptorRendererTest extends JetLiteFixture {
             if (renderedDescriptors.length() != 0) {
                 renderedDescriptors.append("\n");
             }
-            renderedDescriptors.append(DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor));
+            renderedDescriptors.append(DescriptorRenderer.FQ_NAMES_IN_TYPES.render(descriptor));
         }
 
         Document document = new DocumentImpl(psiFile.getText());
diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
index 52fd933e796..b3dfaf639b8 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
+++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
@@ -367,6 +367,6 @@ public abstract class ExpectedResolveData {
 
     @NotNull
     private static String renderNullableDescriptor(@Nullable DeclarationDescriptor d) {
-        return d == null ? "<null>" : DescriptorRenderer.FQNAMES_IN_TYPES.render(d);
+        return d == null ? "<null>" : DescriptorRenderer.FQ_NAMES_IN_TYPES.render(d);
     }
 }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
index e7747601a92..fdb8c33901e 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
@@ -176,6 +176,6 @@ class LazyJavaAnnotationDescriptor(
 
 
     override fun toString(): String {
-        return DescriptorRenderer.FQNAMES_IN_TYPES.renderAnnotation(this)
+        return DescriptorRenderer.FQ_NAMES_IN_TYPES.renderAnnotation(this)
     }
 }
\ No newline at end of file
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java
index d38d241a7b9..4f73ab247ca 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java
@@ -58,6 +58,6 @@ public class AnnotationDescriptorImpl implements AnnotationDescriptor {
 
     @Override
     public String toString() {
-        return DescriptorRenderer.FQNAMES_IN_TYPES.renderAnnotation(this);
+        return DescriptorRenderer.FQ_NAMES_IN_TYPES.renderAnnotation(this);
     }
 }
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java
index a9a0693c018..4a0ecef5075 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java
@@ -194,7 +194,7 @@ public class TypeParameterDescriptorImpl extends DeclarationDescriptorNonRootImp
     @Override
     public String toString() {
         try {
-            return DescriptorRenderer.FQNAMES_IN_TYPES.render(this);
+            return DescriptorRenderer.FQ_NAMES_IN_TYPES.render(this);
         } catch (Exception e) {
             return this.getClass().getName() + "@" + System.identityHashCode(this);
         }
diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java
index efc2e3978ca..0bd66ed6670 100644
--- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java
+++ b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java
@@ -54,7 +54,7 @@ public interface DescriptorRenderer extends Renderer<DeclarationDescriptor> {
             .setModifiers()
             .setStartFromName(true).build();
 
-    DescriptorRenderer FQNAMES_IN_TYPES = new DescriptorRendererBuilder().build();
+    DescriptorRenderer FQ_NAMES_IN_TYPES = new DescriptorRendererBuilder().build();
 
     DescriptorRenderer SHORT_NAMES_IN_TYPES = new DescriptorRendererBuilder().setShortNames(true).build();
 
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java
index 45f512a4170..dcb54181b9b 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java
@@ -37,7 +37,7 @@ public class JetFunctionPsiElementCellRenderer extends DefaultPsiElementCellRend
             SimpleFunctionDescriptor fd =
                     bindingContext.get(BindingContext.FUNCTION, function);
             assert fd != null;
-            return DescriptorRenderer.FQNAMES_IN_TYPES.render(fd);
+            return DescriptorRenderer.FQ_NAMES_IN_TYPES.render(fd);
         }
         return super.getElementText(element);
     }
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
index 430166bff21..626a041d452 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
@@ -301,7 +301,7 @@ public object ShortenReferences {
         }
     }
 
-    private fun DeclarationDescriptor.asString() = DescriptorRenderer.FQNAMES_IN_TYPES.render(this)
+    private fun DeclarationDescriptor.asString() = DescriptorRenderer.FQ_NAMES_IN_TYPES.render(this)
 
     //TODO: do we need this "IfNeeded" check?
     private fun addImportIfNeeded(descriptor: DeclarationDescriptor, file: JetFile) {
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java
index 3f093853cda..bb25ae33962 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java
@@ -131,7 +131,7 @@ public class MoveDeclarationsOutHelper {
             typeString = typeRef.getText();
         }
         else if (!propertyType.isError()) {
-            typeString = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(propertyType);
+            typeString = DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(propertyType);
         }
 
         return JetPsiFactory.createProperty(property.getProject(), property.getName(), typeString, property.isVar(), initializer);
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java
index f7f65b10669..d80e0666277 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java
@@ -146,7 +146,7 @@ public final class DescriptorLookupConverter {
                     InsertHandler<LookupElement> handler = getDefaultInsertHandler(descriptor);
                     assert handler != null:
                             "Special kotlin handler is expected for function: " + declaration.getText() +
-                            " and descriptor: " + DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor);
+                            " and descriptor: " + DescriptorRenderer.FQ_NAMES_IN_TYPES.render(descriptor);
 
                     return new JavaMethodCallElementWithCustomHandler(declaration).setInsertHandler(handler);
                 }
diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java
index c8dbf3a37da..fb7b392cc77 100644
--- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java
@@ -75,7 +75,7 @@ public class KotlinTypeHierarchyProvider extends JavaTypeHierarchyProvider {
                 if (functionDescriptor != null) {
                     JetType type = functionDescriptor.getReturnType();
                     if (type != null) {
-                        String returnTypeText = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type);
+                        String returnTypeText = DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(type);
                         if (returnTypeText.equals(functionName)) {
                             Collection<JetClassOrObject> classOrObjects =
                                     JetClassShortNameIndex.getInstance().get(functionName, project, GlobalSearchScope.allScope(project));
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java
index a11fc5274c9..edf007229e4 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java
@@ -262,8 +262,8 @@ public class DeprecatedAnnotationVisitor extends AfterAnalysisHighlightingVisito
             return "val " + descriptor.getName();
         }
         else if (descriptor instanceof FunctionDescriptor) {
-            return "fun " + descriptor.getName() + DescriptorRenderer.FQNAMES_IN_TYPES.renderFunctionParameters((FunctionDescriptor) descriptor);
+            return "fun " + descriptor.getName() + DescriptorRenderer.FQ_NAMES_IN_TYPES.renderFunctionParameters((FunctionDescriptor) descriptor);
         }
-        return DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor);
+        return DescriptorRenderer.FQ_NAMES_IN_TYPES.render(descriptor);
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
index 5de8b0f0810..20e69ff8dc5 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
@@ -317,7 +317,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
         else {
             JBPopup popup = NavigationUtil.getPsiElementPopup(PsiUtilCore.toPsiElementArray(list),
                                                               new JetFunctionPsiElementCellRenderer(bindingContext),
-                                                              DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor));
+                                                              DescriptorRenderer.FQ_NAMES_IN_TYPES.render(descriptor));
             if (event != null) {
                 popup.show(new RelativePoint(event));
             }
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
index 2af09c03000..b431bd6e792 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
@@ -68,7 +68,7 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
     public void visitExpression(@NotNull JetExpression expression) {
         JetType autoCast = bindingContext.get(AUTOCAST, expression);
         if (autoCast != null) {
-            holder.createInfoAnnotation(expression, "Automatically cast to " + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(autoCast)).setTextAttributes(
+            holder.createInfoAnnotation(expression, "Automatically cast to " + DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(autoCast)).setTextAttributes(
                 JetHighlightingColors.AUTO_CASTED_VALUE);
         }
         super.visitExpression(expression);
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt b/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt
index a4414886421..f78695cabe3 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt
@@ -51,7 +51,7 @@ public class InsertExplicitTypeArguments : JetSelfTargetingIntention<JetCallExpr
 
         val typeArgs = types.map {
             assert(args[it] != null, "there is a null in the type arguments to transform")
-            val typeToCompute = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(args[it]!!);
+            val typeToCompute = DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(args[it]!!);
             val computedTypeRef = JetPsiFactory.createType(element.getProject(), typeToCompute)
             ShortenReferences.process(computedTypeRef)
             computedTypeRef.getText()
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
index 262abb41864..b69b6cb6e90 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
@@ -235,7 +235,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
 
             @Override
             protected String getResult(JetType element) {
-                return DescriptorRenderer.FQNAMES_IN_TYPES.renderType(element);
+                return DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(element);
             }
         };
 
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
index e89d63e9e2d..643c641d5cf 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
@@ -115,7 +115,7 @@ public class DeclarationUtils {
         JetType inferredType = getPropertyTypeIfNeeded(property);
 
         String typeStr = inferredType != null
-                         ? DescriptorRenderer.FQNAMES_IN_TYPES.renderType(inferredType)
+                         ? DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(inferredType)
                          : JetPsiUtil.getNullableText(property.getTypeRef());
 
         //noinspection ConstantConditions
diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java b/idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java
index 659307385a8..6c4b9fffc2b 100644
--- a/idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java
@@ -149,7 +149,7 @@ public class MemberMatching {
             return true;
         }
         if (declarationReceiver != null && descriptorReceiver != null) {
-            return declarationReceiver.getText().equals(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(descriptorReceiver.getType()));
+            return declarationReceiver.getText().equals(DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(descriptorReceiver.getType()));
         }
         return false;
     }
@@ -178,7 +178,7 @@ public class MemberMatching {
 
             JetType typeToRender = varargInDeclaration ? descriptorParameter.getVarargElementType() : descriptorParameter.getType();
             assert typeToRender != null;
-            String descriptorParameterText = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(typeToRender);
+            String descriptorParameterText = DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(typeToRender);
             if (!declarationTypeText.equals(descriptorParameterText)) {
                 return false;
             }
@@ -227,12 +227,12 @@ public class MemberMatching {
                     descriptor.getUpperBounds(), new Function<JetType, String>() {
                 @Override
                 public String fun(JetType type) {
-                    return DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type);
+                    return DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(type);
                 }
             }));
 
             Set<String> decompiledUpperBounds = decompiledParameterToBounds.get(descriptor.getName()).isEmpty()
-                    ? Sets.newHashSet(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(KotlinBuiltIns.getInstance().getDefaultBound()))
+                    ? Sets.newHashSet(DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(KotlinBuiltIns.getInstance().getDefaultBound()))
                     : Sets.newHashSet(decompiledParameterToBounds.get(descriptor.getName()));
             if (!descriptorUpperBounds.equals(decompiledUpperBounds)) {
                 return false;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
index 6f2fbb10fb2..89af6865108 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
@@ -62,10 +62,10 @@ public class MapPlatformClassToKotlinFix extends JetIntentionAction<JetReference
     @NotNull
     @Override
     public String getText() {
-        String platformClassQualifiedName = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(platformClass.getDefaultType());
+        String platformClassQualifiedName = DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(platformClass.getDefaultType());
         return possibleClasses.size() == 1
                ? JetBundle.message("map.platform.class.to.kotlin", platformClassQualifiedName,
-                                   DescriptorRenderer.FQNAMES_IN_TYPES.renderType(possibleClasses.iterator().next().getDefaultType()))
+                                   DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(possibleClasses.iterator().next().getDefaultType()))
                : JetBundle.message("map.platform.class.to.kotlin.multiple", platformClassQualifiedName);
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt
index 7199e2d28ac..e9653359775 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt
@@ -137,5 +137,5 @@ class ExtractionData(
 private fun compareDescriptors(d1: DeclarationDescriptor?, d2: DeclarationDescriptor?): Boolean {
     return d1 == d2 ||
             (d1 != null && d2 != null &&
-                    DescriptorRenderer.FQNAMES_IN_TYPES.render(d1) == DescriptorRenderer.FQNAMES_IN_TYPES.render(d2))
+                    DescriptorRenderer.FQ_NAMES_IN_TYPES.render(d1) == DescriptorRenderer.FQ_NAMES_IN_TYPES.render(d2))
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
index ae88bc7dd69..95a0d44abf4 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
@@ -516,7 +516,7 @@ fun ExtractionDescriptor.validate(): ExtractionDescriptorWithConflicts {
 
 fun ExtractionDescriptor.getFunctionText(
         withBody: Boolean = true,
-        descriptorRenderer: DescriptorRenderer = DescriptorRenderer.FQNAMES_IN_TYPES
+        descriptorRenderer: DescriptorRenderer = DescriptorRenderer.FQ_NAMES_IN_TYPES
 ): String {
     return FunctionBuilder().let { builder ->
         builder.modifier(visibility)
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java
index 799b4c4f61f..f827469e500 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java
@@ -237,7 +237,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
         return StringUtil.join(fun.getValueParameters(), new Function<ValueParameterDescriptor, String>() {
             @Override
             public String fun(ValueParameterDescriptor descriptor) {
-                return descriptor.getName() + ": " + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(descriptor.getType());
+                return descriptor.getName() + ": " + DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(descriptor.getType());
             }
         }, ", ");
     }
@@ -358,7 +358,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
         return StringUtil.join(typeArguments, new Function<JetType, String>() {
             @Override
             public String fun(JetType type) {
-                return DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type);
+                return DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(type);
             }
         }, ", ");
     }
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
index a366296e218..2dad47189aa 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
@@ -34,7 +34,6 @@ import com.intellij.refactoring.introduce.inplace.OccurrencesChooser;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.di.InjectorForMacros;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTraceContext;
@@ -251,7 +250,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
             public void run() {
                 String variableText = "val " + suggestedNames[0];
                 if (noTypeInference) {
-                    variableText += ": " + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(expressionType);
+                    variableText += ": " + DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(expressionType);
                 }
                 variableText += " = ";
                 if (expression instanceof JetParenthesizedExpression) {
diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
index 9c92fca9092..1b183cb7a29 100644
--- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
+++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
@@ -187,7 +187,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
         JetScope memberScope = getMemberScope(containingDeclaration);
         if (memberScope == null) return null;
 
-        String renderedOriginal = DescriptorRenderer.FQNAMES_IN_TYPES.render(originalDescriptor);
+        String renderedOriginal = DescriptorRenderer.FQ_NAMES_IN_TYPES.render(originalDescriptor);
         Collection<? extends DeclarationDescriptor> descriptors;
         if (originalDescriptor instanceof ConstructorDescriptor && containingDeclaration instanceof ClassDescriptor) {
             descriptors = ((ClassDescriptor) containingDeclaration).getConstructors();
@@ -196,7 +196,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
             descriptors = memberScope.getAllDescriptors();
         }
         for (DeclarationDescriptor member : descriptors) {
-            if (renderedOriginal.equals(DescriptorRenderer.FQNAMES_IN_TYPES.render(member))) {
+            if (renderedOriginal.equals(DescriptorRenderer.FQ_NAMES_IN_TYPES.render(member))) {
                 return member;
             }
         }
diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java
index 67edff8f6ca..565827cf874 100644
--- a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java
+++ b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java
@@ -191,7 +191,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
             FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor;
             ReceiverParameterDescriptor receiver = functionDescriptor.getReceiverParameter();
             if (receiver != null) {
-                textBuilder.append(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(receiver.getType())).append(".");
+                textBuilder.append(DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(receiver.getType())).append(".");
             }
 
             textBuilder.append(functionDescriptor.getName());
@@ -202,7 +202,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
                         @Override
                         public String fun(ValueParameterDescriptor valueParameterDescriptor) {
                             return valueParameterDescriptor.getName() + ":" +
-                                   DescriptorRenderer.FQNAMES_IN_TYPES.renderType(valueParameterDescriptor.getType());
+                                   DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(valueParameterDescriptor.getType());
                         }
                     },
                     ",");
@@ -211,13 +211,13 @@ public class JetStructureViewElement implements StructureViewTreeElement {
 
             JetType returnType = functionDescriptor.getReturnType();
             assert returnType != null;
-            textBuilder.append(":").append(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(returnType));
+            textBuilder.append(":").append(DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(returnType));
         }
         else if (descriptor instanceof VariableDescriptor) {
             JetType outType = ((VariableDescriptor) descriptor).getType();
 
             textBuilder = new StringBuilder(descriptor.getName().asString());
-            textBuilder.append(":").append(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(outType));
+            textBuilder.append(":").append(DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(outType));
         }
         else if (descriptor instanceof ClassDescriptor) {
             textBuilder = new StringBuilder(descriptor.getName().asString());
@@ -227,7 +227,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
                     .append(")");
         }
         else {
-            return DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor);
+            return DescriptorRenderer.FQ_NAMES_IN_TYPES.render(descriptor);
         }
 
         return textBuilder.toString();