diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt
index 806468836ad..68a84f2db7d 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt
@@ -246,10 +246,10 @@ class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
         when (containerOptions.classType) {
             AndroidContainerType.ACTIVITY, AndroidContainerType.SUPPORT_FRAGMENT_ACTIVITY, AndroidContainerType.VIEW, AndroidContainerType.DIALOG -> {
                 loadId()
-                iv.invokevirtual(className, "findViewById", "(I)Landroid/view/View;", false)
+                iv.invokevirtual(containerOptions.classType.internalClassName, "findViewById", "(I)Landroid/view/View;", false)
             }
             AndroidContainerType.FRAGMENT, AndroidContainerType.SUPPORT_FRAGMENT -> {
-                iv.invokevirtual(className, "getView", "()Landroid/view/View;", false)
+                iv.invokevirtual(containerOptions.classType.internalClassName, "getView", "()Landroid/view/View;", false)
                 iv.dup()
                 val lgetViewNotNull = Label()
                 iv.ifnonnull(lgetViewNotNull)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt
index af4209708da..f97d68d7ebf 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt
@@ -14,7 +14,7 @@ fun MyFragment.b() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL test/MyFragment\.getView
+// 1 INVOKEVIRTUAL android/app/Fragment\.getView
 // 2 GETSTATIC test/R\$id\.login
 // 2 INVOKEVIRTUAL test/MyFragment\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt
index 0e31da2e50b..a3c554f4f45 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt
@@ -10,7 +10,7 @@ class MyFragment: Fragment() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL test/MyFragment\.getView
+// 1 INVOKEVIRTUAL android/app/Fragment\.getView
 // 2 GETSTATIC test/R\$id\.MyButton
 // 2 INVOKEVIRTUAL test/MyFragment\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt
index 0e31da2e50b..a3c554f4f45 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt
@@ -10,7 +10,7 @@ class MyFragment: Fragment() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL test/MyFragment\.getView
+// 1 INVOKEVIRTUAL android/app/Fragment\.getView
 // 2 GETSTATIC test/R\$id\.MyButton
 // 2 INVOKEVIRTUAL test/MyFragment\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt
index c61737c92e1..fbfc8dbc38c 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt
@@ -15,7 +15,7 @@ class MyFragment: Fragment() {
 
 // 2 public _\$_findCachedViewById
 // 2 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL test/MyFragment\.getView
+// 1 INVOKEVIRTUAL android/app/Fragment\.getView
 // 1 GETSTATIC test/R\$id\.login : I
 // 1 GETSTATIC test/R\$id\.loginButton : I
 // 1 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt
index e4fe14b824c..3cb8c3bc252 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt
@@ -10,7 +10,7 @@ public class MyFragment : Fragment() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL test/MyFragment\.getView
+// 1 INVOKEVIRTUAL android/app/Fragment\.getView
 // 1 GETSTATIC test/R\$id\.login
 // 1 INVOKEVIRTUAL test/MyFragment\._\$_findCachedViewById
 // 1 CHECKCAST android/widget/Button
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/simpleView.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/simpleView.kt
index a192d8cacc0..012240db1eb 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/simpleView.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/simpleView.kt
@@ -9,7 +9,7 @@ public class MyActivity : Activity() {
 }
 
 // 1 public _\$_findCachedViewById
-// 1 INVOKEVIRTUAL test/MyActivity\.findViewById
+// 1 INVOKEVIRTUAL android/app/Activity\.findViewById
 // 1 public _\$_clearFindViewByIdCache
 // 1 GETSTATIC test/R\$id\.login
 // 1 INVOKEVIRTUAL android/view/View\.findViewById
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/supportExtensionFunctionsFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/supportExtensionFunctionsFragment.kt
index 8a7aa8d19ed..f68bb6f8066 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/supportExtensionFunctionsFragment.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/supportExtensionFunctionsFragment.kt
@@ -20,7 +20,7 @@ fun MyFragment.b() {
 
 // 2 public _\$_findCachedViewById
 // 2 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL android/support/v4/app/MyFragment\.getView
+// 2 INVOKEVIRTUAL android/support/v4/app/Fragment\.getView
 // 2 GETSTATIC test/R\$id\.login
 // 2 INVOKEVIRTUAL android/support/v4/app/MyFragment\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragment/supportSimpleFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragment/supportSimpleFragment.kt
index 549c504f200..841c06a0ade 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragment/supportSimpleFragment.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragment/supportSimpleFragment.kt
@@ -16,7 +16,7 @@ public class MyFragment : Fragment() {
 
 // 2 public _\$_findCachedViewById
 // 2 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL android/support/v4/app/MyFragment\.getView
+// 2 INVOKEVIRTUAL android/support/v4/app/Fragment\.getView
 // 1 GETSTATIC test/R\$id\.login
 // 1 INVOKEVIRTUAL android/support/v4/app/MyFragment\._\$_findCachedViewById
 // 1 CHECKCAST android/widget/Button
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewStub/viewStub.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewStub/viewStub.kt
index 81c59765e96..4dc2c79989f 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewStub/viewStub.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewStub/viewStub.kt
@@ -13,6 +13,6 @@ public class MyActivity : Activity() {
 
 // 1 GETSTATIC test/R\$id\.stub
 // 0 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
-// 1 INVOKEVIRTUAL android/app/Activity\.findViewById
+// 2 INVOKEVIRTUAL android/app/Activity\.findViewById
 // 1 CHECKCAST android/view/ViewStub
 // 2 CHECKCAST android/view/View
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/viewWithCache.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/viewWithCache.kt
index 3b8ed65d4db..d061845720f 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/viewWithCache.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/viewWithCache.kt
@@ -14,11 +14,10 @@ class MyActivity : Activity() {
 }
 
 // 2 public _\$_findCachedViewById
-// 1 INVOKEVIRTUAL test/MyActivity\.findViewById
+// 1 INVOKEVIRTUAL android/app/Activity\.findViewById
 // 2 public _\$_clearFindViewByIdCache
 // 1 GETSTATIC test/R\$id\.login
-// 0 INVOKEVIRTUAL android/view/View\.findViewById
-// 1 INVOKEVIRTUAL test/MyView\.findViewById
+// 1 INVOKEVIRTUAL android/view/View\.findViewById
 // 0 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
 // 0 INVOKEVIRTUAL android/view/View\._\$_findCachedViewById
 // 1 CHECKCAST android/widget/Button
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithEntityOptionsNoCache/viewWithEntityOptionsNoCache.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithEntityOptionsNoCache/viewWithEntityOptionsNoCache.kt
index 816cdbaae3b..6f6185385bc 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithEntityOptionsNoCache/viewWithEntityOptionsNoCache.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithEntityOptionsNoCache/viewWithEntityOptionsNoCache.kt
@@ -14,7 +14,7 @@ class MyActivity : Activity() {
 }
 
 // 1 public _\$_findCachedViewById
-// 1 INVOKEVIRTUAL test/MyActivity\.findViewById
+// 1 INVOKEVIRTUAL android/app/Activity\.findViewById
 // 1 public _\$_clearFindViewByIdCache
 // 1 GETSTATIC test/R\$id\.login
 // 1 INVOKEVIRTUAL android/view/View\.findViewById