diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java
index 52d985989ac..08b762da9e7 100644
--- a/src/org/jetbrains/jet/j2k/Converter.java
+++ b/src/org/jetbrains/jet/j2k/Converter.java
@@ -62,7 +62,7 @@ public class Converter {
     List<Statement> result = new LinkedList<Statement>();
     for (Field f : fields) {
       final String identifierToKotlin = f.getIdentifier().toKotlin();
-      result.add(new DummyStringStatement("this." + identifierToKotlin + " = " + identifierToKotlin));
+      result.add(new DummyStringStatement("$" + identifierToKotlin + " = " + identifierToKotlin));
     }
     return result;
   }
@@ -87,7 +87,7 @@ public class Converter {
     final IdentifierImpl name = new IdentifierImpl(psiClass.getName());
 
     // we create primary constructor
-    if (!psiClass.isEnum() && getPrimaryConstructor(psiClass) == null) {
+    if (!psiClass.isEnum() && !psiClass.isInterface() && getPrimaryConstructor(psiClass) == null) {
       final List<Field> finalOrWithEmptyInitializer = getFinalOrWithEmptyInitializer(fields);
       final Map<String, String> initializers = new HashMap<String, String>();
 
diff --git a/testData/ast/callChainExpression/file/libraryFieldCall.kt b/testData/ast/callChainExpression/file/libraryFieldCall.kt
index a276cdee6ba..e73fec3b331 100644
--- a/testData/ast/callChainExpression/file/libraryFieldCall.kt
+++ b/testData/ast/callChainExpression/file/libraryFieldCall.kt
@@ -3,7 +3,7 @@ class object {
 val ourOut : PrintStream?
 }
 {
-this.ourOut = ourOut
+$ourOut = ourOut
 }
 }
 open class User() {
diff --git a/testData/ast/callChainExpression/file/libraryStringFieldCall.kt b/testData/ast/callChainExpression/file/libraryStringFieldCall.kt
index 49e83aea5a9..f0b4a755514 100644
--- a/testData/ast/callChainExpression/file/libraryStringFieldCall.kt
+++ b/testData/ast/callChainExpression/file/libraryStringFieldCall.kt
@@ -1,7 +1,7 @@
 open class Library(myString : String?) {
 public val myString : String?
 {
-this.myString = myString
+$myString = myString
 }
 }
 open class User() {
diff --git a/testData/ast/class/class/classWithMultiplyFields.kt b/testData/ast/class/class/classWithMultiplyFields.kt
index 6d2dbd78c0b..284615f1d67 100644
--- a/testData/ast/class/class/classWithMultiplyFields.kt
+++ b/testData/ast/class/class/classWithMultiplyFields.kt
@@ -3,7 +3,7 @@ var a : String?
 var b : String?
 var c : String? = "abc"
 {
-this.a = a
-this.b = b
+$a = a
+$b = b
 }
 }
\ No newline at end of file
diff --git a/testData/ast/constructors/file/identifier.kt b/testData/ast/constructors/file/identifier.kt
index 692852c2fdd..71bfa01998e 100644
--- a/testData/ast/constructors/file/identifier.kt
+++ b/testData/ast/constructors/file/identifier.kt
@@ -22,8 +22,8 @@ open public fun getName() : String? {
 return myName
 }
 {
-this.myName = myName
-this.myHasDollar = myHasDollar
+$myName = myName
+$myHasDollar = myHasDollar
 }
 }
 public open class User() {
diff --git a/testData/ast/field/file/internalField.kt b/testData/ast/field/file/internalField.kt
index 9666f1c611d..e1619fe519b 100644
--- a/testData/ast/field/file/internalField.kt
+++ b/testData/ast/field/file/internalField.kt
@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 var f : Foo?
 {
-this.f = f
+$f = f
 }
 }
\ No newline at end of file
diff --git a/testData/ast/field/file/privateField.kt b/testData/ast/field/file/privateField.kt
index aefb7b6f0f0..d86a453cada 100644
--- a/testData/ast/field/file/privateField.kt
+++ b/testData/ast/field/file/privateField.kt
@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 private var f : Foo?
 {
-this.f = f
+$f = f
 }
 }
\ No newline at end of file
diff --git a/testData/ast/field/file/protectedField.kt b/testData/ast/field/file/protectedField.kt
index 132c8174abc..e874bfa3195 100644
--- a/testData/ast/field/file/protectedField.kt
+++ b/testData/ast/field/file/protectedField.kt
@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 protected var f : Foo?
 {
-this.f = f
+$f = f
 }
 }
\ No newline at end of file
diff --git a/testData/ast/field/file/publicField.kt b/testData/ast/field/file/publicField.kt
index 24c1ac8956e..610d873990b 100644
--- a/testData/ast/field/file/publicField.kt
+++ b/testData/ast/field/file/publicField.kt
@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 public var f : Foo?
 {
-this.f = f
+$f = f
 }
 }
\ No newline at end of file
diff --git a/testData/ast/field/file/valWithInit.kt b/testData/ast/field/file/valWithInit.kt
index 48c4b7e68f1..94b58759762 100644
--- a/testData/ast/field/file/valWithInit.kt
+++ b/testData/ast/field/file/valWithInit.kt
@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 val f : Foo? = Foo(1, 2)
 {
-this.f = f
+$f = f
 }
 }
\ No newline at end of file
diff --git a/testData/ast/field/file/varWithoutInit.kt b/testData/ast/field/file/varWithoutInit.kt
index 9666f1c611d..e1619fe519b 100644
--- a/testData/ast/field/file/varWithoutInit.kt
+++ b/testData/ast/field/file/varWithoutInit.kt
@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 var f : Foo?
 {
-this.f = f
+$f = f
 }
 }
\ No newline at end of file
diff --git a/testData/ast/trait/class/interfaceWithFields.kt b/testData/ast/trait/class/interfaceWithFields.kt
index 1797878a578..8e2b43d7e84 100644
--- a/testData/ast/trait/class/interfaceWithFields.kt
+++ b/testData/ast/trait/class/interfaceWithFields.kt
@@ -4,9 +4,4 @@ val IN : String? = "in"
 val AT : String? = "@"
 val COMMA_WITH_SPACE : String? = (COMMA + SPACE)
 }
-{
-this.IN = IN
-this.AT = AT
-this.COMMA_WITH_SPACE = COMMA_WITH_SPACE
-}
 }
\ No newline at end of file
diff --git a/testData/ast/trait/class/interfaceWithStaticFields.kt b/testData/ast/trait/class/interfaceWithStaticFields.kt
index 8adea3fdf39..22d47bf9a91 100644
--- a/testData/ast/trait/class/interfaceWithStaticFields.kt
+++ b/testData/ast/trait/class/interfaceWithStaticFields.kt
@@ -4,9 +4,4 @@ public val IN : String? = "in"
 public val AT : String? = "@"
 public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)
 }
-{
-this.IN = IN
-this.AT = AT
-this.COMMA_WITH_SPACE = COMMA_WITH_SPACE
-}
 }
\ No newline at end of file