diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 12c0556fd90..c40c88c5864 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,6 @@
     <list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java" />
     </list>
     <ignored path="k2js.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -245,7 +242,7 @@
           <file leaf-file-name="StandardClassesTest.java" pinned="false" current="true" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="25" column="40" selection-start="500" selection-end="500" vertical-scroll-proportion="0.64786583">
+                <state line="25" column="63" selection-start="500" selection-end="500" vertical-scroll-proportion="0.64786583">
                   <folding />
                 </state>
               </provider>
@@ -323,7 +320,7 @@
           <file leaf-file-name="CallTranslator.java" pinned="false" current="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="57" column="71" selection-start="3098" selection-end="3098" vertical-scroll-proportion="0.3732504">
+                <state line="136" column="24" selection-start="6367" selection-end="6367" vertical-scroll-proportion="0.93001556">
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -379,7 +376,7 @@
           <file leaf-file-name="ReferenceTranslator.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="72" column="2" selection-start="2847" selection-end="2847" vertical-scroll-proportion="0.0">
+                <state line="30" column="38" selection-start="1459" selection-end="1459" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -1242,7 +1239,7 @@
     <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
     <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="Refactor call translator." />
+    <option name="LAST_COMMIT_MESSAGE" value="refactor ReferenceTranslator" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1255,7 +1252,6 @@
     <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <MESSAGE value="Added and sorted tests from jet repository. Fixed a bug with custom setter." />
     <MESSAGE value="Fixed a bug where you could not reference an object from a function literal defined inside a method.&#10;Also removed when conditional call code." />
     <MESSAGE value="Supported classes not calling ancestor constructor." />
     <MESSAGE value="Worked on namer." />
@@ -1280,6 +1276,7 @@
     <MESSAGE value="fix &quot;enclosingThis&quot; bug" />
     <MESSAGE value="refactor and improve. Adopt standard class array implementation" />
     <MESSAGE value="Refactor call translator." />
+    <MESSAGE value="refactor ReferenceTranslator" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1324,13 +1321,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/standardClasses/out/array.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="16" column="19" selection-start="455" selection-end="455" vertical-scroll-proportion="0.0">
@@ -1359,13 +1349,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="72" column="2" selection-start="2847" selection-end="2847" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/src/com/google/dart/compiler/backend/js/JsConstructExpressionVisitor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="101" column="0" selection-start="2699" selection-end="2699" vertical-scroll-proportion="0.0">
@@ -1382,15 +1365,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="57" column="71" selection-start="3098" selection-end="3098" vertical-scroll-proportion="0.3732504">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="221" column="5" selection-start="10200" selection-end="10200" vertical-scroll-proportion="0.0">
@@ -1398,9 +1372,32 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/standardClasses/out/array.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="30" column="38" selection-start="1459" selection-end="1459" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="136" column="24" selection-start="6367" selection-end="6367" vertical-scroll-proportion="0.93001556">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="25" column="40" selection-start="500" selection-end="500" vertical-scroll-proportion="0.64786583">
+        <state line="25" column="63" selection-start="500" selection-end="500" vertical-scroll-proportion="0.64786583">
           <folding />
         </state>
       </provider>
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
index 76526c24dae..f3379dce177 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
@@ -1,6 +1,8 @@
 package org.jetbrains.k2js.translate.reference;
 
-import com.google.dart.compiler.backend.js.ast.*;
+import com.google.dart.compiler.backend.js.ast.JsExpression;
+import com.google.dart.compiler.backend.js.ast.JsInvocation;
+import com.google.dart.compiler.backend.js.ast.JsNew;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -134,12 +136,12 @@ public final class CallTranslator extends AbstractTranslator {
     }
 
     @NotNull
-    private JsNameRef qualifiedMethodReference(@Nullable DeclarationDescriptor descriptor) {
-        JsName methodName = context().getNameForDescriptor(descriptor);
+    private JsExpression qualifiedMethodReference(@NotNull DeclarationDescriptor descriptor) {
+        JsExpression methodReference = ReferenceTranslator.translateReference(descriptor, context());
         if (receiver != null) {
-            return AstUtil.qualified(methodName, receiver);
+            AstUtil.setQualifier(methodReference, receiver);
         }
-        return methodName.makeRef();
+        return methodReference;
     }
 
     @NotNull