diff --git a/.idea/modules.xml b/.idea/modules.xml
index f7cd1f14..dea0765f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/flutter_inappbrowser.iml" filepath="$PROJECT_DIR$/flutter_inappbrowser.iml" />
-      <module fileurl="file://$PROJECT_DIR$/flutter_inappbrowser_android.iml" filepath="$PROJECT_DIR$/flutter_inappbrowser_android.iml" />
+      <module fileurl="file://$PROJECT_DIR$/flutter_inappwebview.iml" filepath="$PROJECT_DIR$/flutter_inappwebview.iml" />
+      <module fileurl="file://$PROJECT_DIR$/flutter_inappwebview_android.iml" filepath="$PROJECT_DIR$/flutter_inappwebview_android.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fe5354b2..98b11018 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -15,9 +15,127 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="9b41f7a2-a71e-4923-91fb-249d7815b3e7" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/proguard-rules.pro" beforeDir="false" afterPath="$PROJECT_DIR$/android/proguard-rules.pro" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/settings.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ChromeCustomTabsActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsOptions.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ChromeCustomTabsOptions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/CustomTabActivityHelper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabsHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/CustomTabsHelper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/KeepAliveService.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/KeepAliveService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ServiceConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnectionCallback.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ServiceConnectionCallback.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlocker.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlocker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerAction.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerActionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerActionType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerTrigger.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerTrigger.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerTriggerResourceType.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerTriggerResourceType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/Credential.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/Credential.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialContract.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialContract.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDatabaseHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDatabaseHelper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpace.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpace.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpaceContract.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpaceContract.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpaceDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpaceDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabaseHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabaseHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/FlutterWebView.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/FlutterWebView.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/FlutterWebViewFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/FlutterWebViewFactory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowser.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowserActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserFlutterPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFlutterPlugin.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserOptions.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowserOptions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/DisplayListenerProxy.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/DisplayListenerProxy.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebView.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebView.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewChromeClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewChromeClient.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewClient.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewOptions.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewOptions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InputAwareWebView.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InputAwareWebView.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/PreferredContentModeOptionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/PreferredContentModeOptionType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/ThreadedInputConnectionProxyAdapterView.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/ThreadedInputConnectionProxyAdapterView.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/JavaScriptBridgeInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/JavaScriptBridgeInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/MyCookieManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyCookieManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/Options.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Options.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/RequestPermissionHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/Util.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Util.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/res/layout/activity_web_view.xml" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/res/layout/activity_web_view.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/example/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/android/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/app/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/android/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/app/src/main/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/ios/Flutter/flutter_export_environment.sh" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Flutter/flutter_export_environment.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/ios/Runner.xcodeproj/project.pbxproj" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Runner.xcodeproj/project.pbxproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/ios/Runner/Info.plist" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Runner/Info.plist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/lib/chrome_safari_browser_example.screen.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/chrome_safari_browser_example.screen.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/lib/in_app_browser_example.screen.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/in_app_browser_example.screen.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/lib/in_app_webiew_example.screen.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/in_app_webiew_example.screen.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_assets/in_app_webview_initial_file_test.html" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_assets/in_app_webview_initial_file_test.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_assets/in_app_webview_javascript_handler_test.html" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_assets/in_app_webview_javascript_handler_test.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_assets/in_app_webview_on_js_dialog_test.html" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_assets/in_app_webview_on_js_dialog_test.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_assets/in_app_webview_on_load_resource_custom_scheme_test.html" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_assets/in_app_webview_on_load_resource_custom_scheme_test.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_assets/in_app_webview_on_navigation_state_change_test.html" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_assets/in_app_webview_on_navigation_state_change_test.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_assets/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_assets/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/custom_widget_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/custom_widget_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_ajax_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_ajax_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_content_blocker_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_content_blocker_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_cookie_manager_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_cookie_manager_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_fetch_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_fetch_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_http_auth_credential_database_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_http_auth_credential_database_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_initial_data_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_initial_data_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_initial_file_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_initial_file_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_initial_url_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_initial_url_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_javascript_handler_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_javascript_handler_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_console_message_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_console_message_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_download_start_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_download_start_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_find_result_received_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_find_result_received_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_js_dialog_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_js_dialog_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_error_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_error_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_http_error_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_http_error_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_resource_custom_scheme_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_resource_custom_scheme_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_resource_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_resource_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_navigation_state_change_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_navigation_state_change_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_progress_changed_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_progress_changed_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_received_http_auth_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_received_http_auth_request_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_safe_browsing_hit_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_safe_browsing_hit_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_scroll_changed_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_scroll_changed_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_target_blank_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_on_target_blank_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_should_override_url_loading_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_should_override_url_loading_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/test_driver/in_app_webview_ssl_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/test_driver/in_app_webview_ssl_request_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flutter_inappbrowser.iml" beforeDir="false" afterPath="$PROJECT_DIR$/flutter_inappwebview.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flutter_inappbrowser_android.iml" beforeDir="false" afterPath="$PROJECT_DIR$/flutter_inappwebview_android.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/CredentialDatabase.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/CredentialDatabase.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/CustomeSchemeHandler.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/CustomeSchemeHandler.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/FlutterWebViewController.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/FlutterWebViewController.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/FlutterWebViewFactory.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/FlutterWebViewFactory.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/InAppBrowserFlutterPlugin.h" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/InAppWebViewFlutterPlugin.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/InAppBrowserFlutterPlugin.m" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/InAppWebViewFlutterPlugin.m" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/InAppBrowserOptions.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/InAppBrowserOptions.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/InAppBrowserWebViewController.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/InAppBrowserWebViewController.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/InAppWebView.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/InAppWebView.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/InAppWebViewOptions.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/InAppWebViewOptions.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/MyCookieManager.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/MyCookieManager.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/Options.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/Options.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/SafariBrowserOptions.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/SafariBrowserOptions.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/SafariViewController.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/SafariViewController.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/SwiftFlutterPlugin.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/SwiftFlutterPlugin.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Classes/WKProcessPoolManager.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/WKProcessPoolManager.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/Storyboards/WebView.storyboard" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Storyboards/WebView.storyboard" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ios/flutter_inappbrowser.podspec" beforeDir="false" afterPath="$PROJECT_DIR$/ios/flutter_inappwebview.podspec" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/flutter_inappbrowser.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/flutter_inappwebview.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/cookie_manager.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/cookie_manager.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http_auth_credentials_database.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http_auth_credentials_database.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/in_app_browser.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/in_app_browser.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/in_app_webview.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/in_app_webview.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/types.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/types.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/webview_options.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/webview_options.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.dart_tool/" />
     <ignored path="$PROJECT_DIR$/.idea/" />
@@ -40,8 +158,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="216">
-              <caret line="450" selection-start-line="450" selection-end-line="450" />
+            <state relative-caret-position="135">
+              <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
               <folding>
                 <element signature="e#0#39#0" expanded="true" />
                 <element signature="e#0#39#0" expanded="true" />
@@ -50,11 +168,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="29">
-              <caret line="2" column="28" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="28" />
+            <state relative-caret-position="255">
+              <caret line="17" column="101" lean-forward="true" selection-start-line="17" selection-start-column="101" selection-end-line="17" selection-end-column="101" />
             </state>
           </provider>
         </entry>
@@ -62,22 +180,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+            <state relative-caret-position="285">
+              <caret line="19" selection-start-line="19" selection-end-line="19" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test.sh">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/in_app_webview.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="188">
-              <caret line="218" column="45" selection-start-line="218" selection-start-column="45" selection-end-line="218" selection-end-column="45" />
+            <state relative-caret-position="235">
+              <caret line="1170" column="66" selection-start-line="1170" selection-start-column="66" selection-end-line="1170" selection-end-column="66" />
               <folding>
                 <element signature="e#0#17#0" expanded="true" />
               </folding>
@@ -85,30 +198,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/in_app_browser.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="183">
-              <caret line="532" column="5" lean-forward="true" selection-start-line="532" selection-start-column="5" selection-end-line="532" selection-end-column="5" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/types.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="313">
-              <caret line="1614" column="101" selection-start-line="1614" selection-start-column="70" selection-end-line="1614" selection-end-column="101" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -121,7 +210,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>isOpened</find>
       <find>initialScale</find>
       <find>e spinner when the WebView is loading a page. The default value i</find>
       <find>reload</find>
@@ -143,14 +231,15 @@
       <find>this.</find>
       <find>Event fires</find>
       <find>onSafe</find>
-      <find>Response({</find>
       <find>onPermission</find>
       <find>onPermissionRequest</find>
       <find>Event fired</find>
       <find>[InAppBrowser] web</find>
       <find>WebView</find>
       <find>[InAppBrowser]</find>
-      <find>Event fired</find>
+      <find>Response({</find>
+      <find>flutterInAppBrowserPlatformReady</find>
+      <find>flutter_inappbrowser</find>
     </findStrings>
     <replaceStrings>
       <replace>activity.getPreferences(0)</replace>
@@ -158,9 +247,13 @@
       <replace>com.pichillilorenzo.flutter_inappbrowser</replace>
       <replace>flutter_inappbrowser</replace>
       <replace>Event fired</replace>
+      <replace>flutterInAppWebViewPlatformReady</replace>
+      <replace>flutter_inappwebview</replace>
     </replaceStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$/example/android</dir>
+      <dir>$PROJECT_DIR$/example</dir>
+      <dir>$PROJECT_DIR$</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -169,26 +262,34 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test.sh" />
-        <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_navigation_change_test.dart" />
-        <option value="$PROJECT_DIR$/example/test_assets/in_app_webview_on_navigation_state_change_test.html" />
-        <option value="$PROJECT_DIR$/lib/src/content_blocker.dart" />
-        <option value="$PROJECT_DIR$/example/test_driver/app.dart" />
-        <option value="$PROJECT_DIR$/example/test_driver/util_test.dart" />
+        <option value="$PROJECT_DIR$/.github/ISSUE_TEMPLATE/BUG_REPORT.md" />
+        <option value="$PROJECT_DIR$/example/test_driver/app_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/chrome_safari_browser.dart" />
+        <option value="$PROJECT_DIR$/example/assets/index.html" />
+        <option value="$PROJECT_DIR$/lib/src/types.dart" />
+        <option value="$PROJECT_DIR$/example/android/app/src/main/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/flutter_inappwebview.dart" />
+        <option value="$PROJECT_DIR$/ios/flutter_inappbrowser.podspec" />
+        <option value="$PROJECT_DIR$/example/lib/in_app_webiew_example.screen.dart" />
+        <option value="$PROJECT_DIR$/example/lib/in_app_browser_example.screen.dart" />
+        <option value="$PROJECT_DIR$/example/lib/chrome_safari_browser_example.screen.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/custom_widget_test.dart" />
-        <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_initial_url_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_ajax_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_content_blocker_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_cookie_manager_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_fetch_test.dart" />
+        <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_http_auth_credential_database_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_initial_data_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_initial_file_test.dart" />
+        <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_initial_url_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_javascript_handler_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_console_message_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_download_start_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_find_result_received_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_js_dialog_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_error_test.dart" />
+        <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_http_error_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_resource_custom_scheme_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_resource_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_navigation_state_change_test.dart" />
@@ -198,28 +299,20 @@
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_scroll_changed_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_target_blank_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_should_override_url_loading_test.dart" />
-        <option value="$PROJECT_DIR$/example/test_driver/main_test.dart" />
-        <option value="$PROJECT_DIR$/.github/ISSUE_TEMPLATE/BUG_REPORT.md" />
-        <option value="$PROJECT_DIR$/example/test_driver/app_test.dart" />
         <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_ssl_request_test.dart" />
-        <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_http_auth_credential_database_test.dart" />
-        <option value="$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_http_error_test.dart" />
-        <option value="$PROJECT_DIR$/example/lib/in_app_browser_example.screen.dart" />
-        <option value="$PROJECT_DIR$/example/lib/chrome_safari_browser_example.screen.dart" />
-        <option value="$PROJECT_DIR$/example/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/src/webview_options.dart" />
-        <option value="$PROJECT_DIR$/lib/src/chrome_safari_browser.dart" />
-        <option value="$PROJECT_DIR$/lib/src/cookie_manager.dart" />
-        <option value="$PROJECT_DIR$/example/assets/index.html" />
-        <option value="$PROJECT_DIR$/lib/src/types.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/example/android/app/src/main/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/example/lib/main.dart" />
-        <option value="$PROJECT_DIR$/example/lib/in_app_webiew_example.screen.dart" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/lib/src/in_app_webview.dart" />
         <option value="$PROJECT_DIR$/lib/src/in_app_browser.dart" />
+        <option value="$PROJECT_DIR$/lib/src/webview_options.dart" />
+        <option value="$PROJECT_DIR$/example/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/example/lib/main.dart" />
+        <option value="$PROJECT_DIR$/ios/Classes/InAppBrowserFlutterPlugin.m" />
+        <option value="$PROJECT_DIR$/ios/Classes/InAppWebViewFlutterPlugin.h" />
+        <option value="$PROJECT_DIR$/ios/Classes/SwiftFlutterPlugin.swift" />
+        <option value="$PROJECT_DIR$/lib/src/in_app_webview.dart" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/lib/src/cookie_manager.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http_auth_credentials_database.dart" />
+        <option value="$PROJECT_DIR$/example/test_assets/in_app_webview_initial_file_test.html" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -263,51 +356,18 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="flutter_inappbrowser" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_inappbrowser" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_inappwebview" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_inappwebview" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="flutter_inappbrowser" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_inappbrowser" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_inappwebview" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_inappwebview" type="462c0819:PsiDirectoryNode" />
               <item name="example" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="flutter_inappbrowser" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_inappbrowser" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_inappbrowser" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_inappbrowser" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="test_driver" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_inappbrowser" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_inappbrowser" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_inappbrowser" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_inappbrowser" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_inappbrowser" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_inappbrowser" type="462c0819:PsiDirectoryNode" />
-              <item name="nodejs_server_test_auth_basic_and_ssl" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_inappbrowser" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -323,6 +383,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -335,7 +396,7 @@
     <property name="dart.analysis.tool.window.force.activate" value="false" />
     <property name="editor.config.ad.shown" value="true" />
     <property name="io.flutter.reload.alreadyRun" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/example/test_driver" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="project.structure.last.edited" value="SDK Location" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -523,417 +584,11 @@
     </ignored-roots>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_initial_file_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_javascript_handler_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="502">
-          <caret line="35" column="30" selection-start-line="35" selection-start-column="30" selection-end-line="35" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_download_start_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_js_dialog_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_resource_custom_scheme_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_resource_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="26" column="30" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_navigation_state_change_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_progress_changed_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_received_http_auth_request_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="22" column="30" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_safe_browsing_hit_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="23" column="30" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_scroll_changed_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="22" column="30" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_target_blank_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_should_override_url_loading_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.github/ISSUE_TEMPLATE/BUG_REPORT.md">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_find_result_received_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="156">
-          <caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/custom_widget_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="24" column="3" selection-start-line="24" selection-start-column="3" selection-end-line="24" selection-end-column="3" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_ssl_request_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="49" column="48" lean-forward="true" selection-start-line="49" selection-start-column="48" selection-end-line="49" selection-end-column="48" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_http_auth_credential_database_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="455">
-          <caret line="63" column="84" selection-start-line="63" selection-start-column="84" selection-end-line="63" selection-end-column="84" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_http_error_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="424">
-          <caret line="51" column="20" lean-forward="true" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_error_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="50" column="21" selection-start-line="46" selection-start-column="20" selection-end-line="50" selection-end-column="21" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_console_message_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="492">
-          <caret line="49" column="22" selection-start-line="45" selection-start-column="20" selection-end-line="49" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.packages">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/app.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/content_blocker.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/app_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="55">
-          <caret line="503" column="45" selection-start-line="503" selection-start-column="45" selection-end-line="503" selection-end-column="45" />
-          <folding>
-            <element signature="e#35#55#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/test.dart" />
-    <entry file="file://$PROJECT_DIR$/example/lib/in_app_browser_example.screen.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="25" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/chrome_safari_browser_example.screen.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" selection-start-line="5" selection-end-line="22" selection-end-column="1" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/chrome_safari_browser.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="397">
-          <caret line="105" column="3" selection-start-line="92" selection-start-column="2" selection-end-line="105" selection-end-column="3" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_initial_url_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/in_app_localhost_server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-65">
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/cookie_manager.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="14" column="45" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http_auth_credentials_database.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="366">
-          <caret line="96" column="65" lean-forward="true" selection-start-line="96" selection-start-column="5" selection-end-line="96" selection-end-column="65" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/flutter/bin/cache/pkg/sky_engine/lib/core/iterable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="301" column="4" selection-start-line="301" selection-start-column="4" selection-end-line="301" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/flutter/packages/flutter/lib/src/services/system_navigator.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/main_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="115" column="25" selection-start-line="115" selection-start-column="16" selection-end-line="115" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="376">
-          <caret line="43" column="9" selection-start-line="43" selection-start-column="9" selection-end-line="43" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/webview_options.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="235" column="7" selection-start-line="235" selection-start-column="7" selection-end-line="235" selection-end-column="7" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/assets/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="14" column="41" lean-forward="true" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nodejs_server_test_auth_basic_and_ssl/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="78" column="85" selection-start-line="78" selection-start-column="77" selection-end-line="78" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-3.3.0/lib/src/permission_enums.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-145">
-          <caret line="162" column="14" selection-start-line="162" selection-start-column="4" selection-end-line="162" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/app/src/main/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="64" lean-forward="true" selection-start-line="17" selection-start-column="64" selection-end-line="17" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/in_app_webiew_example.screen.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1485">
-          <caret line="99" column="22" lean-forward="true" selection-start-line="99" selection-start-column="22" selection-end-line="99" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="27" column="17" lean-forward="true" selection-start-line="27" selection-start-column="17" selection-end-line="27" selection-end-column="17" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="450" selection-start-line="450" selection-end-line="450" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/types.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="313">
-          <caret line="1614" column="101" selection-start-line="1614" selection-start-column="70" selection-end-line="1614" selection-end-column="101" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_ajax_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-164">
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
+            <element signature="e#0#41#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -941,24 +596,231 @@
     <entry file="file://$PROJECT_DIR$/test.sh">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+    <entry file="file://$PROJECT_DIR$/lib/src/types.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="29">
-          <caret line="2" column="28" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="28" />
+        <state relative-caret-position="570">
+          <caret line="1614" column="101" selection-start-line="1614" selection-start-column="70" selection-end-line="1614" selection-end-column="101" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/example/flutter_webview_example_android.iml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/flutter_webview_example.iml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ios/flutter_inappwebview.podspec">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="44" selection-start-line="4" selection-start-column="44" selection-end-line="4" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/lib/in_app_browser_example.screen.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="57" selection-start-line="3" selection-start-column="57" selection-end-line="3" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/lib/chrome_safari_browser_example.screen.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="57" selection-start-line="1" selection-start-column="57" selection-end-line="1" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/custom_widget_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="57" selection-start-line="3" selection-start-column="57" selection-end-line="3" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_ajax_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
-          <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/in_app_webview.dart">
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_content_blocker_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="218" column="45" selection-start-line="218" selection-start-column="45" selection-end-line="218" selection-end-column="45" />
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_cookie_manager_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_fetch_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="57" selection-start-line="4" selection-start-column="57" selection-end-line="4" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_http_auth_credential_database_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_initial_data_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_initial_file_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_initial_url_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_javascript_handler_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_console_message_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_download_start_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_find_result_received_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_js_dialog_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_error_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_http_error_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_resource_custom_scheme_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="57" selection-start-line="3" selection-start-column="57" selection-end-line="3" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_load_resource_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_navigation_state_change_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_progress_changed_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_received_http_auth_request_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_safe_browsing_hit_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="57" selection-start-line="4" selection-start-column="57" selection-end-line="4" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_scroll_changed_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_on_target_blank_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_should_override_url_loading_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_driver/in_app_webview_ssl_request_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-496">
+          <folding>
+            <element signature="e#1#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/webview_options.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="3" column="20" selection-start-line="3" selection-start-column="20" selection-end-line="3" selection-end-column="20" />
           <folding>
             <element signature="e#0#17#0" expanded="true" />
           </folding>
@@ -967,14 +829,126 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/in_app_browser.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="532" column="5" lean-forward="true" selection-start-line="532" selection-start-column="5" selection-end-line="532" selection-end-column="5" />
+        <state relative-caret-position="90">
+          <caret line="6" column="8" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/lib/in_app_webiew_example.screen.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="57" selection-start-line="1" selection-start-column="57" selection-end-line="1" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ios/Classes/InAppWebViewFlutterPlugin.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ios/Classes/InAppWebViewFlutterPlugin.m">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="20" column="41" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/ios/Classes/SwiftFlutterPlugin.swift">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="765">
+          <caret line="51" column="91" selection-start-line="51" selection-start-column="71" selection-end-line="51" selection-end-column="91" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/in_app_webview.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="235">
+          <caret line="1170" column="66" selection-start-line="1170" selection-start-column="66" selection-end-line="1170" selection-end-column="66" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/cookie_manager.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="101" selection-start-line="12" selection-start-column="101" selection-end-line="12" selection-end-column="101" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http_auth_credentials_database.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="101" selection-start-line="13" selection-start-column="101" selection-end-line="13" selection-end-column="101" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/assets/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-147" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/test_assets/in_app_webview_initial_file_test.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/android/src/main/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="17" column="101" lean-forward="true" selection-start-line="17" selection-start-column="101" selection-end-line="17" selection-end-column="101" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0a286f1..a8a335b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,17 +4,17 @@
 
 ## 2.0.0
 
-- Merge "Avoid null pointer exception after webview is disposed" [#116](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/116) (thanks to [robsonfingo](https://github.com/robsonfingo))
-- Merge "Remove async call in close" [#119](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/119) (thanks to [benfingo](https://github.com/benfingo))
-- Merge "Android takeScreenshot does not work properly." [#122](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/122) (thanks to [PauloMelo](https://github.com/PauloMelo))
-- Merge "Resolving gradle error." [#144](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/144) (thanks to [Klingens13](https://github.com/Klingens13))
-- Merge "Create issue and pull request templates" [#150](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/150) (thanks to [deandreamatias](https://github.com/deandreamatias))
-- Merge "Fix abstract method error && swift version error" [#155](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/155) (thanks to [AlexVincent525](https://github.com/AlexVincent525))
-- Merge "migrating to swift 5.0" [#162](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/162) (thanks to [fattiger00](https://github.com/fattiger00))
-- Merge "Update readme example" [#178](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/178) (thanks to [SebastienBtr](https://github.com/SebastienBtr))
-- Merge "handle choose file callback in android" [#183](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/183) (thanks to [crazecoder](https://github.com/crazecoder))
-- Merge "add initialScale in android" [#186](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/186) (thanks to [crazecoder](https://github.com/crazecoder))
-- Added `horizontalScrollBarEnabled` and `verticalScrollBarEnabled` options to enable/disable the corresponding scrollbar of the WebView [#165](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/165)
+- Merge "Avoid null pointer exception after webview is disposed" [#116](https://github.com/pichillilorenzo/flutter_inappwebview/pull/116) (thanks to [robsonfingo](https://github.com/robsonfingo))
+- Merge "Remove async call in close" [#119](https://github.com/pichillilorenzo/flutter_inappwebview/pull/119) (thanks to [benfingo](https://github.com/benfingo))
+- Merge "Android takeScreenshot does not work properly." [#122](https://github.com/pichillilorenzo/flutter_inappwebview/pull/122) (thanks to [PauloMelo](https://github.com/PauloMelo))
+- Merge "Resolving gradle error." [#144](https://github.com/pichillilorenzo/flutter_inappwebview/pull/144) (thanks to [Klingens13](https://github.com/Klingens13))
+- Merge "Create issue and pull request templates" [#150](https://github.com/pichillilorenzo/flutter_inappwebview/pull/150) (thanks to [deandreamatias](https://github.com/deandreamatias))
+- Merge "Fix abstract method error && swift version error" [#155](https://github.com/pichillilorenzo/flutter_inappwebview/pull/155) (thanks to [AlexVincent525](https://github.com/AlexVincent525))
+- Merge "migrating to swift 5.0" [#162](https://github.com/pichillilorenzo/flutter_inappwebview/pull/162) (thanks to [fattiger00](https://github.com/fattiger00))
+- Merge "Update readme example" [#178](https://github.com/pichillilorenzo/flutter_inappwebview/pull/178) (thanks to [SebastienBtr](https://github.com/SebastienBtr))
+- Merge "handle choose file callback in android" [#183](https://github.com/pichillilorenzo/flutter_inappwebview/pull/183) (thanks to [crazecoder](https://github.com/crazecoder))
+- Merge "add initialScale in android" [#186](https://github.com/pichillilorenzo/flutter_inappwebview/pull/186) (thanks to [crazecoder](https://github.com/crazecoder))
+- Added `horizontalScrollBarEnabled` and `verticalScrollBarEnabled` options to enable/disable the corresponding scrollbar of the WebView [#165](https://github.com/pichillilorenzo/flutter_inappwebview/issues/165)
 - Added `onDownloadStart` event and `useOnDownloadStart` option: event fires when the WebView recognizes and starts a downloadable file.
 - Added `onLoadResourceCustomScheme` event and `resourceCustomSchemes` option to set custom schemes that WebView must handle to load resources
 - Added `onTargetBlank` event and `useOnTargetBlank` option to manage links with `target="_blank"`
@@ -52,37 +52,37 @@
 
 ## 1.2.2
 
-- Merge "added a shared WKProcessPool for webview instances" [#198](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/198) (thanks to [robertcnst](https://github.com/robertcnst))
+- Merge "added a shared WKProcessPool for webview instances" [#198](https://github.com/pichillilorenzo/flutter_inappwebview/pull/198) (thanks to [robertcnst](https://github.com/robertcnst))
 - Fixed iOS setCookie.
 
 ## 1.2.1
 
-- Merge "Add new option to control the contentMode in Android platform" [#101](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/101) (thanks to [DreamBuddy](https://github.com/DreamBuddy))
-- Merge "Fix crash on xcode 10.2" [#107](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/107) (thanks to [robsonfingo](https://github.com/robsonfingo))
-- Merge "Remove headers_build_phase from example's Podfile" [#108](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/108) (thanks to [robsonfingo](https://github.com/robsonfingo))
-- Fixed "Make html5 video fullscreen" for Android [#43](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/43)
-- Fixed "AllowsInlineMediaPlayback not working" for iOS [#73](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/73)
+- Merge "Add new option to control the contentMode in Android platform" [#101](https://github.com/pichillilorenzo/flutter_inappwebview/pull/101) (thanks to [DreamBuddy](https://github.com/DreamBuddy))
+- Merge "Fix crash on xcode 10.2" [#107](https://github.com/pichillilorenzo/flutter_inappwebview/pull/107) (thanks to [robsonfingo](https://github.com/robsonfingo))
+- Merge "Remove headers_build_phase from example's Podfile" [#108](https://github.com/pichillilorenzo/flutter_inappwebview/pull/108) (thanks to [robsonfingo](https://github.com/robsonfingo))
+- Fixed "Make html5 video fullscreen" for Android [#43](https://github.com/pichillilorenzo/flutter_inappwebview/issues/43)
+- Fixed "AllowsInlineMediaPlayback not working" for iOS [#73](https://github.com/pichillilorenzo/flutter_inappwebview/issues/73)
 
 ## 1.2.0
 
-- Merge "Adds a transparentBackground option for iOS and Android" [#86](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/86) (thanks to [matthewlloyd](https://github.com/matthewlloyd))
-- Merge "The 'open' method requires an options dictionary" [#87](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/87) (thanks to [matthewlloyd](https://github.com/matthewlloyd))
-- Merge "iOS: Call setNeedsLayout() in scrollViewDidScroll()" [#88](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/88) (thanks to [matthewlloyd](https://github.com/matthewlloyd))
-- Fixed "java.lang.RuntimeException: Methods marked with @UiThread must be executed on the main thread." [#98](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/98) (thanks to [DreamBuddy](https://github.com/DreamBuddy))
-- Fixed "app force close/crash when enabling zoom and repeatedly changing orientation and zoomin zoomout" [#93](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/93)
+- Merge "Adds a transparentBackground option for iOS and Android" [#86](https://github.com/pichillilorenzo/flutter_inappwebview/pull/86) (thanks to [matthewlloyd](https://github.com/matthewlloyd))
+- Merge "The 'open' method requires an options dictionary" [#87](https://github.com/pichillilorenzo/flutter_inappwebview/pull/87) (thanks to [matthewlloyd](https://github.com/matthewlloyd))
+- Merge "iOS: Call setNeedsLayout() in scrollViewDidScroll()" [#88](https://github.com/pichillilorenzo/flutter_inappwebview/pull/88) (thanks to [matthewlloyd](https://github.com/matthewlloyd))
+- Fixed "java.lang.RuntimeException: Methods marked with @UiThread must be executed on the main thread." [#98](https://github.com/pichillilorenzo/flutter_inappwebview/issues/98) (thanks to [DreamBuddy](https://github.com/DreamBuddy))
+- Fixed "app force close/crash when enabling zoom and repeatedly changing orientation and zoomin zoomout" [#93](https://github.com/pichillilorenzo/flutter_inappwebview/issues/93)
 - Added `displayZoomControls` webview option for Android
-- Fixed "Compatibility with other plugins" [#80](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/80)
+- Fixed "Compatibility with other plugins" [#80](https://github.com/pichillilorenzo/flutter_inappwebview/issues/80)
 
 ## 1.1.3
 
-- Merge "Add null checks around calls to InAppWebView callbacks" [#85](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/85) (thanks to [matthewlloyd](https://github.com/matthewlloyd))
+- Merge "Add null checks around calls to InAppWebView callbacks" [#85](https://github.com/pichillilorenzo/flutter_inappwebview/pull/85) (thanks to [matthewlloyd](https://github.com/matthewlloyd))
 
 ## 1.1.2
 
-- Fix InAppBrowser crashes the app when i change the page "Lost connection" [#74](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/74)
-- Fix javascript `...args` parameter of `window.flutter_inappbrowser.callHandler()`
-- Merge Enable setTextZoom function of Android WebViewSetting [#81](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/81) (thanks to [YouCii](https://github.com/YouCii))
-- Merge bug fix for android build: Android dependency 'androidx.core:core' has different version for the compile (1.0.0) and runtime (1.0.1) classpath [#83](https://github.com/pichillilorenzo/flutter_inappbrowser/pull/83) (thanks to [cinos1](https://github.com/cinos1))
+- Fix InAppBrowser crashes the app when i change the page "Lost connection" [#74](https://github.com/pichillilorenzo/flutter_inappwebview/issues/74)
+- Fix javascript `...args` parameter of `window.flutter_inappwebview.callHandler()`
+- Merge Enable setTextZoom function of Android WebViewSetting [#81](https://github.com/pichillilorenzo/flutter_inappwebview/pull/81) (thanks to [YouCii](https://github.com/YouCii))
+- Merge bug fix for android build: Android dependency 'androidx.core:core' has different version for the compile (1.0.0) and runtime (1.0.1) classpath [#83](https://github.com/pichillilorenzo/flutter_inappwebview/pull/83) (thanks to [cinos1](https://github.com/cinos1))
 
 ## 1.1.1
 
@@ -91,8 +91,8 @@
 ## 1.1.0
 
 - Breaking change for `addJavaScriptHandler` and `removeJavaScriptHandler` methods.
-- `addJavaScriptHandler` method can return data to JavaScript using `Promise` [#46](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/46)
-- added `flutterInAppBrowserPlatformReady` JavaScript event to wait until the platform is ready [#64](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/64)
+- `addJavaScriptHandler` method can return data to JavaScript using `Promise` [#46](https://github.com/pichillilorenzo/flutter_inappwebview/issues/46)
+- added `flutterInAppBrowserPlatformReady` JavaScript event to wait until the platform is ready [#64](https://github.com/pichillilorenzo/flutter_inappwebview/issues/64)
 
 ## 1.0.1
 
diff --git a/README.md b/README.md
index d9cedfc8..00bad775 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Flutter InAppBrowser Plugin [![Share on Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Flutter%20InAppBrowser%20plugin!&url=https://github.com/pichillilorenzo/flutter_inappbrowser&hashtags=flutter,flutterio,dart,dartlang,webview) [![Share on Facebook](https://img.shields.io/badge/share-facebook-blue.svg?longCache=true&style=flat&colorB=%234267b2)](https://www.facebook.com/sharer/sharer.php?u=https%3A//github.com/pichillilorenzo/flutter_inappbrowser)
+# Flutter InAppBrowser Plugin [![Share on Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Flutter%20InAppBrowser%20plugin!&url=https://github.com/pichillilorenzo/flutter_inappwebview&hashtags=flutter,flutterio,dart,dartlang,webview) [![Share on Facebook](https://img.shields.io/badge/share-facebook-blue.svg?longCache=true&style=flat&colorB=%234267b2)](https://www.facebook.com/sharer/sharer.php?u=https%3A//github.com/pichillilorenzo/flutter_inappwebview)
 
-[![Pub](https://img.shields.io/pub/v/flutter_inappbrowser.svg)](https://pub.dartlang.org/packages/flutter_inappbrowser)
+[![Pub](https://img.shields.io/pub/v/flutter_inappwebview.svg)](https://pub.dartlang.org/packages/flutter_inappwebview)
 [![Awesome Flutter](https://img.shields.io/badge/Awesome-Flutter-blue.svg?longCache=true&style=flat-square)](https://stackoverflow.com/questions/tagged/flutter?sort=votes)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](/LICENSE)
 
@@ -26,11 +26,11 @@ Because of [Flutter AndroidX compatibility](https://flutter.dev/docs/development
 
 If you are starting a new fresh app, you need to create the Flutter App with `flutter create -i swift` (see [flutter/flutter#13422 (comment)](https://github.com/flutter/flutter/issues/13422#issuecomment-392133780)), otherwise, you will get this message:
 ```
-=== BUILD TARGET flutter_inappbrowser OF PROJECT Pods WITH CONFIGURATION Debug ===
+=== BUILD TARGET flutter_inappwebview OF PROJECT Pods WITH CONFIGURATION Debug ===
 The “Swift Language Version” (SWIFT_VERSION) build setting must be set to a supported value for targets which use Swift. Supported values are: 3.0, 4.0, 4.2, 5.0. This setting can be set in the build settings editor.
 ```
 
-If you still have this problem, try to edit iOS `Podfile` like this (see [#15](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/15)):
+If you still have this problem, try to edit iOS `Podfile` like this (see [#15](https://github.com/pichillilorenzo/flutter_inappwebview/issues/15)):
 ```
 target 'Runner' do
   use_frameworks!  # required by simple_permission
@@ -58,7 +58,7 @@ For help on editing plugin code, view the [documentation](https://flutter.io/dev
 
 ## Installation
 
-First, add `flutter_inappbrowser` as a [dependency in your pubspec.yaml file](https://flutter.io/using-packages/).
+First, add `flutter_inappwebview` as a [dependency in your pubspec.yaml file](https://flutter.io/using-packages/).
 
 ## Usage
 
@@ -72,7 +72,7 @@ Classes:
 
 ## API Reference
 
-See the online [API Reference](https://pub.dartlang.org/documentation/flutter_inappbrowser/latest/) to get the full documentation.
+See the online [API Reference](https://pub.dartlang.org/documentation/flutter_inappwebview/latest/) to get the full documentation.
 
 ### Load a file inside `assets` folder
 
@@ -113,7 +113,7 @@ Example:
 ```dart
 import 'dart:async';
 import 'package:flutter/material.dart';
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 Future main() async {
   runApp(new MyApp());
@@ -290,30 +290,30 @@ Screenshots:
 The Android implementation uses [addJavascriptInterface](https://developer.android.com/reference/android/webkit/WebView#addJavascriptInterface(java.lang.Object,%20java.lang.String)).
 The iOS implementation uses [addScriptMessageHandler](https://developer.apple.com/documentation/webkit/wkusercontentcontroller/1537172-addscriptmessagehandler?language=objc)
 
-The JavaScript function that can be used to call the handler is `window.flutter_inappbrowser.callHandler(handlerName <String>, ...args)`, where `args` are [rest parameters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters).
+The JavaScript function that can be used to call the handler is `window.flutter_inappwebview.callHandler(handlerName <String>, ...args)`, where `args` are [rest parameters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters).
 The `args` will be stringified automatically using `JSON.stringify(args)` method and then they will be decoded on the Dart side.
 
-In order to call `window.flutter_inappbrowser.callHandler(handlerName <String>, ...args)` properly, you need to wait and listen the JavaScript event `flutterInAppBrowserPlatformReady`.
+In order to call `window.flutter_inappwebview.callHandler(handlerName <String>, ...args)` properly, you need to wait and listen the JavaScript event `flutterInAppWebViewPlatformReady`.
 This event will be dispatched as soon as the platform (Android or iOS) is ready to handle the `callHandler` method.
 ```javascript
-   window.addEventListener("flutterInAppBrowserPlatformReady", function(event) {
+   window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
      console.log("ready");
    });
 ```
 
-`window.flutter_inappbrowser.callHandler` returns a JavaScript [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
+`window.flutter_inappwebview.callHandler` returns a JavaScript [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
 that can be used to get the json result returned by [JavaScriptHandlerCallback].
 In this case, simply return data that you want to send and it will be automatically json encoded using [jsonEncode] from the `dart:convert` library.
 
 So, on the JavaScript side, to get data coming from the Dart side, you will use:
 ```html
 <script>
-   window.addEventListener("flutterInAppBrowserPlatformReady", function(event) {
-     window.flutter_inappbrowser.callHandler('handlerFoo').then(function(result) {
+   window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
+     window.flutter_inappwebview.callHandler('handlerFoo').then(function(result) {
        console.log(result);
      });
 
-     window.flutter_inappbrowser.callHandler('handlerFooWithArgs', 1, true, ['bar', 5], {foo: 'baz'}).then(function(result) {
+     window.flutter_inappwebview.callHandler('handlerFooWithArgs', 1, true, ['bar', 5], {foo: 'baz'}).then(function(result) {
        console.log(result);
      });
    });
@@ -324,7 +324,7 @@ Instead, on the `onLoadStop` WebView event, you can use `callHandler` directly:
 ```dart
   // Inject JavaScript that will receive data back from Flutter
   inAppWebViewController.evaluateJavascript(source: """
-    window.flutter_inappbrowser.callHandler('test', 'Text from Javascript').then(function(result) {
+    window.flutter_inappwebview.callHandler('test', 'Text from Javascript').then(function(result) {
       console.log(result);
     });
   """);
@@ -459,7 +459,7 @@ Create a Class that extends the `InAppBrowser` Class in order to override the ca
 Example:
 ```dart
 import 'package:flutter/material.dart';
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 class MyInAppBrowser extends InAppBrowser {
   @override
@@ -626,7 +626,7 @@ You can initialize the `ChromeSafariBrowser` instance with an `InAppBrowser` fal
 Create a Class that extends the `ChromeSafariBrowser` Class in order to override the callbacks to manage the browser events. Example:
 ```dart
 import 'package:flutter/material.dart';
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 class MyInAppBrowser extends InAppBrowser {
 
diff --git a/android/build.gradle b/android/build.gradle
index 3fe16b1c..b80e9be9 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,4 +1,4 @@
-group 'com.pichillilorenzo.flutter_inappbrowser'
+group 'com.pichillilorenzo.flutter_inappwebview'
 version '1.0-SNAPSHOT'
 
 buildscript {
diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
index 4930aa46..6621428a 100644
--- a/android/proguard-rules.pro
+++ b/android/proguard-rules.pro
@@ -8,10 +8,10 @@
     public boolean *(android.webkit.WebView, java.lang.String);
     public void *(android.webkit.webView, jav.lang.String);
 }
--keepclassmembers class com.pichillilorenzo.flutter_inappbrowser$JavaScriptBridgeInterface {
+-keepclassmembers class flutter_inappwebview$JavaScriptBridgeInterface {
      <fields>;
      <methods>;
      public *;
      private *;
 }
--keep class com.pichillilorenzo.flutter_inappbrowser.** { *; }
\ No newline at end of file
+-keep class flutter_inappwebview.** { *; }
\ No newline at end of file
diff --git a/android/settings.gradle b/android/settings.gradle
index a8524fae..62d7fc6d 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'flutter_inappbrowser'
+rootProject.name = 'flutter_inappwebview'
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 2a8cbcc8..d7a20146 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.pichillilorenzo.flutter_inappbrowser">
+    package="com.pichillilorenzo.flutter_inappwebview">
     <application>
-        <activity android:theme="@style/AppTheme" android:name=".InAppBrowserActivity" android:configChanges="orientation|screenSize"></activity>
-        <activity android:theme="@style/ThemeTransparent" android:name=".ChromeCustomTabs.ChromeCustomTabsActivity" android:configChanges="orientation|screenSize"></activity>
+        <activity android:theme="@style/AppTheme" android:name="com.pichillilorenzo.flutter_inappwebview.InAppBrowserActivity" android:configChanges="orientation|screenSize"></activity>
+        <activity android:theme="@style/ThemeTransparent" android:name="com.pichillilorenzo.flutter_inappwebview.ChromeCustomTabs.ChromeCustomTabsActivity" android:configChanges="orientation|screenSize"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ChromeCustomTabsActivity.java
similarity index 85%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ChromeCustomTabsActivity.java
index 09ad29be..f563ec81 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ChromeCustomTabsActivity.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs;
+package com.pichillilorenzo.flutter_inappwebview.ChromeCustomTabs;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -7,8 +7,8 @@ import android.net.Uri;
 import android.os.Bundle;
 import androidx.browser.customtabs.CustomTabsIntent;
 
-import com.pichillilorenzo.flutter_inappbrowser.InAppBrowserFlutterPlugin;
-import com.pichillilorenzo.flutter_inappbrowser.R;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview.R;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -36,7 +36,7 @@ public class ChromeCustomTabsActivity extends Activity {
     options = new ChromeCustomTabsOptions();
     options.parse((HashMap<String, Object>) b.getSerializable("options"));
 
-    InAppBrowserFlutterPlugin.inAppBrowser.chromeCustomTabsActivities.put(uuid, this);
+    InAppWebViewFlutterPlugin.inAppBrowser.chromeCustomTabsActivities.put(uuid, this);
 
     customTabActivityHelper = new CustomTabActivityHelper();
     builder = new CustomTabsIntent.Builder();
@@ -49,8 +49,8 @@ public class ChromeCustomTabsActivity extends Activity {
 
     Map<String, Object> obj = new HashMap<>();
     obj.put("uuid", uuid);
-    InAppBrowserFlutterPlugin.inAppBrowser.channel.invokeMethod("onChromeSafariBrowserOpened", obj);
-    InAppBrowserFlutterPlugin.inAppBrowser.channel.invokeMethod("onChromeSafariBrowserLoaded", obj);
+    InAppWebViewFlutterPlugin.inAppBrowser.channel.invokeMethod("onChromeSafariBrowserOpened", obj);
+    InAppWebViewFlutterPlugin.inAppBrowser.channel.invokeMethod("onChromeSafariBrowserLoaded", obj);
   }
 
   private void prepareCustomTabs() {
@@ -86,7 +86,7 @@ public class ChromeCustomTabsActivity extends Activity {
       finish();
       Map<String, Object> obj = new HashMap<>();
       obj.put("uuid", uuid);
-      InAppBrowserFlutterPlugin.inAppBrowser.channel.invokeMethod("onChromeSafariBrowserClosed", obj);
+      InAppWebViewFlutterPlugin.inAppBrowser.channel.invokeMethod("onChromeSafariBrowserClosed", obj);
     }
   }
 
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsOptions.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ChromeCustomTabsOptions.java
similarity index 74%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsOptions.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ChromeCustomTabsOptions.java
index 560cfbae..ecebb5d6 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsOptions.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ChromeCustomTabsOptions.java
@@ -1,6 +1,6 @@
-package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs;
+package com.pichillilorenzo.flutter_inappwebview.ChromeCustomTabs;
 
-import com.pichillilorenzo.flutter_inappbrowser.Options;
+import com.pichillilorenzo.flutter_inappwebview.Options;
 
 public class ChromeCustomTabsOptions extends Options {
 
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/CustomTabActivityHelper.java
similarity index 98%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/CustomTabActivityHelper.java
index fe010cb1..7997a546 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/CustomTabActivityHelper.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs;
+package com.pichillilorenzo.flutter_inappwebview.ChromeCustomTabs;
 
 import android.app.Activity;
 import android.net.Uri;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabsHelper.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/CustomTabsHelper.java
similarity index 98%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabsHelper.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/CustomTabsHelper.java
index 8f6c5a57..23ba0f40 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabsHelper.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/CustomTabsHelper.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs;
+package com.pichillilorenzo.flutter_inappwebview.ChromeCustomTabs;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/KeepAliveService.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/KeepAliveService.java
similarity index 86%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/KeepAliveService.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/KeepAliveService.java
index 009c821f..5b936b1c 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/KeepAliveService.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/KeepAliveService.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs;
+package com.pichillilorenzo.flutter_inappwebview.ChromeCustomTabs;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnection.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ServiceConnection.java
similarity index 95%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnection.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ServiceConnection.java
index 51cff8c9..0cbea7cf 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnection.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ServiceConnection.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs;
+package com.pichillilorenzo.flutter_inappwebview.ChromeCustomTabs;
 
 import android.content.ComponentName;
 import androidx.browser.customtabs.CustomTabsClient;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnectionCallback.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ServiceConnectionCallback.java
similarity index 87%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnectionCallback.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ServiceConnectionCallback.java
index 9c922362..fdf94209 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnectionCallback.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ChromeCustomTabs/ServiceConnectionCallback.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs;
+package com.pichillilorenzo.flutter_inappwebview.ChromeCustomTabs;
 
 import androidx.browser.customtabs.CustomTabsClient;
 
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlocker.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlocker.java
similarity index 81%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlocker.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlocker.java
index c8265741..f9082514 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlocker.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlocker.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ContentBlocker;
+package com.pichillilorenzo.flutter_inappwebview.ContentBlocker;
 
 public class ContentBlocker {
     public ContentBlockerTrigger trigger;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerAction.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerAction.java
similarity index 91%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerAction.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerAction.java
index 150eb6f8..b6ff1193 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerAction.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerAction.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ContentBlocker;
+package com.pichillilorenzo.flutter_inappwebview.ContentBlocker;
 
 import java.util.Map;
 
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerActionType.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerActionType.java
similarity index 92%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerActionType.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerActionType.java
index cd24b2df..8a8601ad 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerActionType.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerActionType.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ContentBlocker;
+package com.pichillilorenzo.flutter_inappwebview.ContentBlocker;
 
 public enum ContentBlockerActionType {
     BLOCK ("block"),
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerHandler.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerHandler.java
similarity index 98%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerHandler.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerHandler.java
index bab67466..e4046b7f 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerHandler.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerHandler.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ContentBlocker;
+package com.pichillilorenzo.flutter_inappwebview.ContentBlocker;
 
 import android.os.Build;
 import android.os.Handler;
@@ -6,8 +6,8 @@ import android.os.Looper;
 import android.util.Log;
 import android.webkit.WebResourceResponse;
 
-import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebView;
-import com.pichillilorenzo.flutter_inappbrowser.Util;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebView.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview.Util;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerTrigger.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerTrigger.java
similarity index 97%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerTrigger.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerTrigger.java
index 26f95996..f364e082 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerTrigger.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerTrigger.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ContentBlocker;
+package com.pichillilorenzo.flutter_inappwebview.ContentBlocker;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerTriggerResourceType.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerTriggerResourceType.java
similarity index 93%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerTriggerResourceType.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerTriggerResourceType.java
index 26407e61..fc78ead5 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerTriggerResourceType.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ContentBlocker/ContentBlockerTriggerResourceType.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.ContentBlocker;
+package com.pichillilorenzo.flutter_inappwebview.ContentBlocker;
 
 public enum ContentBlockerTriggerResourceType {
     DOCUMENT ("document"),
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/Credential.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/Credential.java
similarity index 90%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/Credential.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/Credential.java
index 14606c2e..eaed8ade 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/Credential.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/Credential.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase;
+package com.pichillilorenzo.flutter_inappwebview.CredentialDatabase;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialContract.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialContract.java
similarity index 88%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialContract.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialContract.java
index 7cc8a118..65bb196b 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialContract.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialContract.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase;
+package com.pichillilorenzo.flutter_inappwebview.CredentialDatabase;
 
 import android.provider.BaseColumns;
 
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDao.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDao.java
similarity index 98%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDao.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDao.java
index cd87439d..6f81b661 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDao.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDao.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase;
+package com.pichillilorenzo.flutter_inappwebview.CredentialDatabase;
 
 import android.content.ContentValues;
 import android.database.Cursor;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDatabase.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDatabase.java
similarity index 97%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDatabase.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDatabase.java
index 2c5f7f7f..6279fd8c 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDatabase.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDatabase.java
@@ -1,7 +1,6 @@
-package com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase;
+package com.pichillilorenzo.flutter_inappwebview.CredentialDatabase;
 
 import android.content.Context;
-import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDatabaseHelper.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDatabaseHelper.java
similarity index 98%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDatabaseHelper.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDatabaseHelper.java
index 16e197a0..2cc90777 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/CredentialDatabaseHelper.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/CredentialDatabaseHelper.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase;
+package com.pichillilorenzo.flutter_inappwebview.CredentialDatabase;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpace.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpace.java
similarity index 91%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpace.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpace.java
index 6507738c..1e460fe1 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpace.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpace.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase;
+package com.pichillilorenzo.flutter_inappwebview.CredentialDatabase;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpaceContract.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpaceContract.java
similarity index 89%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpaceContract.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpaceContract.java
index 57070546..d124644c 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpaceContract.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpaceContract.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase;
+package com.pichillilorenzo.flutter_inappwebview.CredentialDatabase;
 
 import android.provider.BaseColumns;
 
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpaceDao.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpaceDao.java
similarity index 98%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpaceDao.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpaceDao.java
index 8401afc9..81d1cdfc 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabase/ProtectionSpaceDao.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabase/ProtectionSpaceDao.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase;
+package com.pichillilorenzo.flutter_inappwebview.CredentialDatabase;
 
 import android.content.ContentValues;
 import android.database.Cursor;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabaseHandler.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabaseHandler.java
similarity index 93%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabaseHandler.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabaseHandler.java
index 45fc541d..976d2da9 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/CredentialDatabaseHandler.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/CredentialDatabaseHandler.java
@@ -1,12 +1,12 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.os.Build;
 
 import androidx.annotation.RequiresApi;
 
-import com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase.Credential;
-import com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase.CredentialDatabase;
-import com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase.ProtectionSpace;
+import com.pichillilorenzo.flutter_inappwebview.CredentialDatabase.Credential;
+import com.pichillilorenzo.flutter_inappwebview.CredentialDatabase.CredentialDatabase;
+import com.pichillilorenzo.flutter_inappwebview.CredentialDatabase.ProtectionSpace;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,7 +28,7 @@ public class CredentialDatabaseHandler implements MethodChannel.MethodCallHandle
 
   public CredentialDatabaseHandler(PluginRegistry.Registrar r) {
     registrar = r;
-    channel = new MethodChannel(registrar.messenger(), "com.pichillilorenzo/flutter_inappbrowser_credential_database");
+    channel = new MethodChannel(registrar.messenger(), "com.pichillilorenzo/flutter_inappwebview_credential_database");
     channel.setMethodCallHandler(this);
     credentialDatabase = CredentialDatabase.getInstance(registrar.context());
   }
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/FlutterWebView.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/FlutterWebView.java
similarity index 97%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/FlutterWebView.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/FlutterWebView.java
index 75866330..fcaae2b5 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/FlutterWebView.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/FlutterWebView.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.app.Activity;
 import android.content.Context;
@@ -10,9 +10,9 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.DisplayListenerProxy;
-import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebView;
-import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebViewOptions;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebView.DisplayListenerProxy;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebView.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebView.InAppWebViewOptions;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/FlutterWebViewFactory.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/FlutterWebViewFactory.java
similarity index 94%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/FlutterWebViewFactory.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/FlutterWebViewFactory.java
index 2a9a1eb3..844d50d8 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/FlutterWebViewFactory.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/FlutterWebViewFactory.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.content.Context;
 import android.view.View;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowser.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowser.java
similarity index 98%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowser.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowser.java
index 554b20ae..6c794b5a 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowser.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowser.java
@@ -19,13 +19,12 @@
  *
  */
 
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.os.Build;
 import android.os.Parcelable;
 import android.provider.Browser;
 import android.net.Uri;
@@ -35,8 +34,8 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.util.Log;
 
-import com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs.ChromeCustomTabsActivity;
-import com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs.CustomTabActivityHelper;
+import com.pichillilorenzo.flutter_inappwebview.ChromeCustomTabs.ChromeCustomTabsActivity;
+import com.pichillilorenzo.flutter_inappwebview.ChromeCustomTabs.CustomTabActivityHelper;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -45,8 +44,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import io.flutter.embedding.engine.plugins.FlutterPlugin;
-import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.Result;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserActivity.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowserActivity.java
similarity index 96%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserActivity.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowserActivity.java
index abad4ec8..497d3d1d 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserActivity.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowserActivity.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -23,8 +23,8 @@ import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 import android.widget.SearchView;
 
-import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebView;
-import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebViewOptions;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebView.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebView.InAppWebViewOptions;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -56,7 +56,7 @@ public class InAppBrowserActivity extends AppCompatActivity {
 
     webView = findViewById(R.id.webView);
     webView.inAppBrowserActivity = this;
-    webView.registrar = InAppBrowserFlutterPlugin.inAppBrowser.registrar;
+    webView.registrar = InAppWebViewFlutterPlugin.inAppBrowser.registrar;
 
     Bundle b = getIntent().getExtras();
     uuid = b.getString("uuid");
@@ -71,7 +71,7 @@ public class InAppBrowserActivity extends AppCompatActivity {
     webViewOptions.parse(optionsMap);
     webView.options = webViewOptions;
 
-    InAppBrowserFlutterPlugin.inAppBrowser.webViewActivities.put(uuid, this);
+    InAppWebViewFlutterPlugin.inAppBrowser.webViewActivities.put(uuid, this);
 
     actionBar = getSupportActionBar();
 
@@ -93,7 +93,7 @@ public class InAppBrowserActivity extends AppCompatActivity {
 
     Map<String, Object> obj = new HashMap<>();
     obj.put("uuid", uuid);
-    InAppBrowserFlutterPlugin.inAppBrowser.channel.invokeMethod("onBrowserCreated", obj);
+    InAppWebViewFlutterPlugin.inAppBrowser.channel.invokeMethod("onBrowserCreated", obj);
 
   }
 
@@ -257,7 +257,7 @@ public class InAppBrowserActivity extends AppCompatActivity {
       if (canGoBack())
         goBack();
       else if (options.closeOnCannotGoBack)
-        InAppBrowserFlutterPlugin.inAppBrowser.close(this, uuid, null);
+        InAppWebViewFlutterPlugin.inAppBrowser.close(this, uuid, null);
       return true;
     }
     return super.onKeyDown(keyCode, event);
@@ -356,7 +356,7 @@ public class InAppBrowserActivity extends AppCompatActivity {
   }
 
   public void closeButtonClicked(MenuItem item) {
-    InAppBrowserFlutterPlugin.inAppBrowser.close(this, uuid, null);
+    InAppWebViewFlutterPlugin.inAppBrowser.close(this, uuid, null);
   }
 
   public byte[] takeScreenshot() {
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserOptions.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowserOptions.java
similarity index 89%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserOptions.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowserOptions.java
index fad45c5d..7fdd4d37 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserOptions.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppBrowserOptions.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 public class InAppBrowserOptions extends Options {
 
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/DisplayListenerProxy.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/DisplayListenerProxy.java
similarity index 98%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/DisplayListenerProxy.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/DisplayListenerProxy.java
index 25f4e29d..cdc7b93e 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/DisplayListenerProxy.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/DisplayListenerProxy.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.InAppWebView;
+package com.pichillilorenzo.flutter_inappwebview.InAppWebView;
 
 import static android.hardware.display.DisplayManager.DisplayListener;
 
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebView.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebView.java
similarity index 94%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebView.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebView.java
index 71f5bfd6..a4fe8adb 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebView.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebView.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.InAppWebView;
+package com.pichillilorenzo.flutter_inappwebview.InAppWebView;
 
 import android.app.Activity;
 import android.content.Context;
@@ -17,15 +17,15 @@ import android.webkit.WebBackForwardList;
 import android.webkit.WebHistoryItem;
 import android.webkit.WebSettings;
 
-import com.pichillilorenzo.flutter_inappbrowser.ContentBlocker.ContentBlocker;
-import com.pichillilorenzo.flutter_inappbrowser.ContentBlocker.ContentBlockerAction;
-import com.pichillilorenzo.flutter_inappbrowser.ContentBlocker.ContentBlockerHandler;
-import com.pichillilorenzo.flutter_inappbrowser.ContentBlocker.ContentBlockerTrigger;
-import com.pichillilorenzo.flutter_inappbrowser.FlutterWebView;
-import com.pichillilorenzo.flutter_inappbrowser.InAppBrowserActivity;
-import com.pichillilorenzo.flutter_inappbrowser.InAppBrowserFlutterPlugin;
-import com.pichillilorenzo.flutter_inappbrowser.JavaScriptBridgeInterface;
-import com.pichillilorenzo.flutter_inappbrowser.Util;
+import com.pichillilorenzo.flutter_inappwebview.ContentBlocker.ContentBlocker;
+import com.pichillilorenzo.flutter_inappwebview.ContentBlocker.ContentBlockerAction;
+import com.pichillilorenzo.flutter_inappwebview.ContentBlocker.ContentBlockerHandler;
+import com.pichillilorenzo.flutter_inappwebview.ContentBlocker.ContentBlockerTrigger;
+import com.pichillilorenzo.flutter_inappwebview.FlutterWebView;
+import com.pichillilorenzo.flutter_inappwebview.InAppBrowserActivity;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview.JavaScriptBridgeInterface;
+import com.pichillilorenzo.flutter_inappwebview.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -38,7 +38,7 @@ import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
 import okhttp3.OkHttpClient;
 
-import static com.pichillilorenzo.flutter_inappbrowser.InAppWebView.PreferredContentModeOptionType.*;
+import static com.pichillilorenzo.flutter_inappwebview.InAppWebView.PreferredContentModeOptionType.*;
 
 final public class InAppWebView extends InputAwareWebView {
 
@@ -83,9 +83,9 @@ final public class InAppWebView extends InputAwareWebView {
           "   }" +
           "})(window.console);";
 
-  static final String platformReadyJS = "window.dispatchEvent(new Event('flutterInAppBrowserPlatformReady'));";
+  static final String platformReadyJS = "window.dispatchEvent(new Event('flutterInAppWebViewPlatformReady'));";
 
-  static final String variableForOnLoadResourceJS = "window._flutter_inappbrowser_useOnLoadResource";
+  static final String variableForOnLoadResourceJS = "window._flutter_inappwebview_useOnLoadResource";
   static final String enableVariableForOnLoadResourceJS = variableForOnLoadResourceJS + " = $PLACEHOLDER_VALUE;";
 
   static final String resourceObserverJS = "(function() {" +
@@ -99,21 +99,21 @@ final public class InAppWebView extends InputAwareWebView {
           "   observer.observe({entryTypes: ['resource']});" +
           "})();";
 
-  static final String variableForShouldInterceptAjaxRequestJS = "window._flutter_inappbrowser_useShouldInterceptAjaxRequest";
+  static final String variableForShouldInterceptAjaxRequestJS = "window._flutter_inappwebview_useShouldInterceptAjaxRequest";
   static final String enableVariableForShouldInterceptAjaxRequestJS = variableForShouldInterceptAjaxRequestJS + " = $PLACEHOLDER_VALUE;";
 
   static final String interceptAjaxRequestsJS = "(function(ajax) {" +
           "  var send = ajax.prototype.send;" +
           "  var open = ajax.prototype.open;" +
           "  var setRequestHeader = ajax.prototype.setRequestHeader;" +
-          "  ajax.prototype._flutter_inappbrowser_url = null;" +
-          "  ajax.prototype._flutter_inappbrowser_method = null;" +
-          "  ajax.prototype._flutter_inappbrowser_isAsync = null;" +
-          "  ajax.prototype._flutter_inappbrowser_user = null;" +
-          "  ajax.prototype._flutter_inappbrowser_password = null;" +
-          "  ajax.prototype._flutter_inappbrowser_password = null;" +
-          "  ajax.prototype._flutter_inappbrowser_already_onreadystatechange_wrapped = false;" +
-          "  ajax.prototype._flutter_inappbrowser_request_headers = {};" +
+          "  ajax.prototype._flutter_inappwebview_url = null;" +
+          "  ajax.prototype._flutter_inappwebview_method = null;" +
+          "  ajax.prototype._flutter_inappwebview_isAsync = null;" +
+          "  ajax.prototype._flutter_inappwebview_user = null;" +
+          "  ajax.prototype._flutter_inappwebview_password = null;" +
+          "  ajax.prototype._flutter_inappwebview_password = null;" +
+          "  ajax.prototype._flutter_inappwebview_already_onreadystatechange_wrapped = false;" +
+          "  ajax.prototype._flutter_inappwebview_request_headers = {};" +
           "  function convertRequestResponse(request, callback) {" +
           "    if (request.response != null && request.responseType != null) {" +
           "      switch (request.responseType) {" +
@@ -139,16 +139,16 @@ final public class InAppWebView extends InputAwareWebView {
           "  };" +
           "  ajax.prototype.open = function(method, url, isAsync, user, password) {" +
           "    isAsync = (isAsync != null) ? isAsync : true;" +
-          "    this._flutter_inappbrowser_url = url;" +
-          "    this._flutter_inappbrowser_method = method;" +
-          "    this._flutter_inappbrowser_isAsync = isAsync;" +
-          "    this._flutter_inappbrowser_user = user;" +
-          "    this._flutter_inappbrowser_password = password;" +
-          "    this._flutter_inappbrowser_request_headers = {};" +
+          "    this._flutter_inappwebview_url = url;" +
+          "    this._flutter_inappwebview_method = method;" +
+          "    this._flutter_inappwebview_isAsync = isAsync;" +
+          "    this._flutter_inappwebview_user = user;" +
+          "    this._flutter_inappwebview_password = password;" +
+          "    this._flutter_inappwebview_request_headers = {};" +
           "    open.call(this, method, url, isAsync, user, password);" +
           "  };" +
           "  ajax.prototype.setRequestHeader = function(header, value) {" +
-          "    this._flutter_inappbrowser_request_headers[header] = value;" +
+          "    this._flutter_inappwebview_request_headers[header] = value;" +
           "    setRequestHeader.call(this, header, value);" +
           "  };" +
           "  function handleEvent(e) {" +
@@ -167,13 +167,13 @@ final public class InAppWebView extends InputAwareWebView {
           "      }" +
           "      convertRequestResponse(this, function(response) {" +
           "        var ajaxRequest = {" +
-          "          method: self._flutter_inappbrowser_method," +
-          "          url: self._flutter_inappbrowser_url," +
-          "          isAsync: self._flutter_inappbrowser_isAsync," +
-          "          user: self._flutter_inappbrowser_user," +
-          "          password: self._flutter_inappbrowser_password," +
+          "          method: self._flutter_inappwebview_method," +
+          "          url: self._flutter_inappwebview_url," +
+          "          isAsync: self._flutter_inappwebview_isAsync," +
+          "          user: self._flutter_inappwebview_user," +
+          "          password: self._flutter_inappwebview_password," +
           "          withCredentials: self.withCredentials," +
-          "          headers: self._flutter_inappbrowser_request_headers," +
+          "          headers: self._flutter_inappwebview_request_headers," +
           "          readyState: self.readyState," +
           "          status: self.status," +
           "          responseURL: self.responseURL," +
@@ -205,8 +205,8 @@ final public class InAppWebView extends InputAwareWebView {
           "  ajax.prototype.send = function(data) {" +
           "    var self = this;" +
           "    if (window." + variableForShouldInterceptAjaxRequestJS + " == null || window." + variableForShouldInterceptAjaxRequestJS + " == true) {" +
-          "      if (!this._flutter_inappbrowser_already_onreadystatechange_wrapped) {" +
-          "        this._flutter_inappbrowser_already_onreadystatechange_wrapped = true;" +
+          "      if (!this._flutter_inappwebview_already_onreadystatechange_wrapped) {" +
+          "        this._flutter_inappwebview_already_onreadystatechange_wrapped = true;" +
           "        var onreadystatechange = this.onreadystatechange;" +
           "        this.onreadystatechange = function() {" +
           "          if (window." + variableForShouldInterceptAjaxRequestJS + " == null || window." + variableForShouldInterceptAjaxRequestJS + " == true) {" +
@@ -223,13 +223,13 @@ final public class InAppWebView extends InputAwareWebView {
           "            }" +
           "            convertRequestResponse(this, function(response) {" +
           "              var ajaxRequest = {" +
-          "                method: self._flutter_inappbrowser_method," +
-          "                url: self._flutter_inappbrowser_url," +
-          "                isAsync: self._flutter_inappbrowser_isAsync," +
-          "                user: self._flutter_inappbrowser_user," +
-          "                password: self._flutter_inappbrowser_password," +
+          "                method: self._flutter_inappwebview_method," +
+          "                url: self._flutter_inappwebview_url," +
+          "                isAsync: self._flutter_inappwebview_isAsync," +
+          "                user: self._flutter_inappwebview_user," +
+          "                password: self._flutter_inappwebview_password," +
           "                withCredentials: self.withCredentials," +
-          "                headers: self._flutter_inappbrowser_request_headers," +
+          "                headers: self._flutter_inappwebview_request_headers," +
           "                readyState: self.readyState," +
           "                status: self.status," +
           "                responseURL: self.responseURL," +
@@ -267,13 +267,13 @@ final public class InAppWebView extends InputAwareWebView {
           "      this.addEventListener('timeout', handleEvent);" +
           "      var ajaxRequest = {" +
           "        data: data," +
-          "        method: this._flutter_inappbrowser_method," +
-          "        url: this._flutter_inappbrowser_url," +
-          "        isAsync: this._flutter_inappbrowser_isAsync," +
-          "        user: this._flutter_inappbrowser_user," +
-          "        password: this._flutter_inappbrowser_password," +
+          "        method: this._flutter_inappwebview_method," +
+          "        url: this._flutter_inappwebview_url," +
+          "        isAsync: this._flutter_inappwebview_isAsync," +
+          "        user: this._flutter_inappwebview_user," +
+          "        password: this._flutter_inappwebview_password," +
           "        withCredentials: this.withCredentials," +
-          "        headers: this._flutter_inappbrowser_request_headers," +
+          "        headers: this._flutter_inappwebview_request_headers," +
           "        responseType: this.responseType" +
           "      };" +
           "      window." + JavaScriptBridgeInterface.name + ".callHandler('shouldInterceptAjaxRequest', ajaxRequest).then(function(result) {" +
@@ -290,15 +290,15 @@ final public class InAppWebView extends InputAwareWebView {
           "          };" +
           "          for (var header in result.headers) {" +
           "            var value = result.headers[header];" +
-          "            var flutter_inappbrowser_value = self._flutter_inappbrowser_request_headers[header];" +
-          "            if (flutter_inappbrowser_value == null) {" +
-          "              self._flutter_inappbrowser_request_headers[header] = value;" +
+          "            var flutter_inappwebview_value = self._flutter_inappwebview_request_headers[header];" +
+          "            if (flutter_inappwebview_value == null) {" +
+          "              self._flutter_inappwebview_request_headers[header] = value;" +
           "            } else {" +
-          "              self._flutter_inappbrowser_request_headers[header] += ', ' + value;" +
+          "              self._flutter_inappwebview_request_headers[header] += ', ' + value;" +
           "            }" +
           "            setRequestHeader.call(self, header, value);" +
           "          };" +
-          "          if ((self._flutter_inappbrowser_method != result.method && result.method != null) || (self._flutter_inappbrowser_url != result.url && result.url != null)) {" +
+          "          if ((self._flutter_inappwebview_method != result.method && result.method != null) || (self._flutter_inappwebview_url != result.url && result.url != null)) {" +
           "            self.abort();" +
           "            self.open(result.method, result.url, result.isAsync, result.user, result.password);" +
           "            return;" +
@@ -312,7 +312,7 @@ final public class InAppWebView extends InputAwareWebView {
           "  };" +
           "})(window.XMLHttpRequest);";
 
-  static final String  variableForShouldInterceptFetchRequestsJS = "window._flutter_inappbrowser_useShouldInterceptFetchRequest";
+  static final String  variableForShouldInterceptFetchRequestsJS = "window._flutter_inappwebview_useShouldInterceptFetchRequest";
   static final String  enableVariableForShouldInterceptFetchRequestsJS = variableForShouldInterceptFetchRequestsJS + " = $PLACEHOLDER_VALUE;";
 
   static final String interceptFetchRequestsJS = "(function(fetch) {" +
@@ -1243,7 +1243,7 @@ final public class InAppWebView extends InputAwareWebView {
   }
 
   private MethodChannel getChannel() {
-    return (inAppBrowserActivity != null) ? InAppBrowserFlutterPlugin.inAppBrowser.channel : flutterWebView.channel;
+    return (inAppBrowserActivity != null) ? InAppWebViewFlutterPlugin.inAppBrowser.channel : flutterWebView.channel;
   }
 
   public void startSafeBrowsing(final MethodChannel.Result result) {
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewChromeClient.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewChromeClient.java
similarity index 97%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewChromeClient.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewChromeClient.java
index 725d5768..333c4b9a 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewChromeClient.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewChromeClient.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.InAppWebView;
+package com.pichillilorenzo.flutter_inappwebview.InAppWebView;
 
 import android.annotation.TargetApi;
 import android.content.ActivityNotFoundException;
@@ -27,10 +27,10 @@ import android.widget.LinearLayout;
 
 import androidx.appcompat.app.AlertDialog;
 
-import com.pichillilorenzo.flutter_inappbrowser.FlutterWebView;
-import com.pichillilorenzo.flutter_inappbrowser.InAppBrowserActivity;
-import com.pichillilorenzo.flutter_inappbrowser.InAppBrowserFlutterPlugin;
-import com.pichillilorenzo.flutter_inappbrowser.R;
+import com.pichillilorenzo.flutter_inappwebview.FlutterWebView;
+import com.pichillilorenzo.flutter_inappwebview.InAppBrowserActivity;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview.R;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -548,7 +548,7 @@ public class InAppWebViewChromeClient extends WebChromeClient implements PluginR
 
   //For Android 5.0+
   public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
-    InAppBrowserFlutterPlugin.uploadMessageArray = filePathCallback;
+    InAppWebViewFlutterPlugin.uploadMessageArray = filePathCallback;
     try {
       Intent contentSelectionIntent = new Intent(Intent.ACTION_GET_CONTENT);
       contentSelectionIntent.addCategory(Intent.CATEGORY_OPENABLE);
@@ -572,7 +572,7 @@ public class InAppWebViewChromeClient extends WebChromeClient implements PluginR
   @Override
   public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
     if (requestCode == FILECHOOSER_RESULTCODE && (resultCode == RESULT_OK || resultCode == RESULT_CANCELED)) {
-      InAppBrowserFlutterPlugin.uploadMessageArray.onReceiveValue(WebChromeClient.FileChooserParams.parseResult(resultCode, data));
+      InAppWebViewFlutterPlugin.uploadMessageArray.onReceiveValue(WebChromeClient.FileChooserParams.parseResult(resultCode, data));
     }
     return true;
   }
@@ -625,6 +625,6 @@ public class InAppWebViewChromeClient extends WebChromeClient implements PluginR
   }
 
   private MethodChannel getChannel() {
-    return (inAppBrowserActivity != null) ? InAppBrowserFlutterPlugin.inAppBrowser.channel : flutterWebView.channel;
+    return (inAppBrowserActivity != null) ? InAppWebViewFlutterPlugin.inAppBrowser.channel : flutterWebView.channel;
   }
 }
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewClient.java
similarity index 97%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewClient.java
index 494a0a14..77e0618e 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewClient.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.InAppWebView;
+package com.pichillilorenzo.flutter_inappwebview.InAppWebView;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -22,13 +22,13 @@ import android.webkit.WebViewClient;
 
 import androidx.annotation.RequiresApi;
 
-import com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase.Credential;
-import com.pichillilorenzo.flutter_inappbrowser.CredentialDatabase.CredentialDatabase;
-import com.pichillilorenzo.flutter_inappbrowser.FlutterWebView;
-import com.pichillilorenzo.flutter_inappbrowser.InAppBrowserActivity;
-import com.pichillilorenzo.flutter_inappbrowser.InAppBrowserFlutterPlugin;
-import com.pichillilorenzo.flutter_inappbrowser.JavaScriptBridgeInterface;
-import com.pichillilorenzo.flutter_inappbrowser.Util;
+import com.pichillilorenzo.flutter_inappwebview.CredentialDatabase.Credential;
+import com.pichillilorenzo.flutter_inappwebview.CredentialDatabase.CredentialDatabase;
+import com.pichillilorenzo.flutter_inappwebview.FlutterWebView;
+import com.pichillilorenzo.flutter_inappwebview.InAppBrowserActivity;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview.JavaScriptBridgeInterface;
+import com.pichillilorenzo.flutter_inappwebview.Util;
 
 import java.io.ByteArrayInputStream;
 import java.net.MalformedURLException;
@@ -668,7 +668,7 @@ public class InAppWebViewClient extends WebViewClient {
   }
 
   private MethodChannel getChannel() {
-    return (inAppBrowserActivity != null) ? InAppBrowserFlutterPlugin.inAppBrowser.channel : flutterWebView.channel;
+    return (inAppBrowserActivity != null) ? InAppWebViewFlutterPlugin.inAppBrowser.channel : flutterWebView.channel;
   }
 
 }
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewOptions.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewOptions.java
similarity index 97%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewOptions.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewOptions.java
index 15c70235..c0739615 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewOptions.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewOptions.java
@@ -1,10 +1,10 @@
-package com.pichillilorenzo.flutter_inappbrowser.InAppWebView;
+package com.pichillilorenzo.flutter_inappwebview.InAppWebView;
 
 import android.os.Build;
 import android.util.Log;
 import android.webkit.WebSettings;
 
-import com.pichillilorenzo.flutter_inappbrowser.Options;
+import com.pichillilorenzo.flutter_inappwebview.Options;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InputAwareWebView.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InputAwareWebView.java
similarity index 99%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InputAwareWebView.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InputAwareWebView.java
index 7e36b36d..6c2ed1f7 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InputAwareWebView.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InputAwareWebView.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.InAppWebView;
+package com.pichillilorenzo.flutter_inappwebview.InAppWebView;
 
 import static android.content.Context.INPUT_METHOD_SERVICE;
 
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/PreferredContentModeOptionType.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/PreferredContentModeOptionType.java
similarity index 80%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/PreferredContentModeOptionType.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/PreferredContentModeOptionType.java
index 59cc7a0d..5905152e 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/PreferredContentModeOptionType.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/PreferredContentModeOptionType.java
@@ -1,6 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.InAppWebView;
-
-import com.pichillilorenzo.flutter_inappbrowser.ContentBlocker.ContentBlockerActionType;
+package com.pichillilorenzo.flutter_inappwebview.InAppWebView;
 
 public enum PreferredContentModeOptionType {
   RECOMMENDED (0),
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/ThreadedInputConnectionProxyAdapterView.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/ThreadedInputConnectionProxyAdapterView.java
similarity index 97%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/ThreadedInputConnectionProxyAdapterView.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/ThreadedInputConnectionProxyAdapterView.java
index b3bb970d..e2b7b48b 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/ThreadedInputConnectionProxyAdapterView.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/ThreadedInputConnectionProxyAdapterView.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser.InAppWebView;
+package com.pichillilorenzo.flutter_inappwebview.InAppWebView;
 
 import android.os.Handler;
 import android.os.IBinder;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserFlutterPlugin.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFlutterPlugin.java
similarity index 90%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserFlutterPlugin.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFlutterPlugin.java
index b00de162..1d236457 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserFlutterPlugin.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFlutterPlugin.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.net.Uri;
 import android.os.Build;
@@ -8,18 +8,18 @@ import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 
-public class InAppBrowserFlutterPlugin implements FlutterPlugin {
+public class InAppWebViewFlutterPlugin implements FlutterPlugin {
   public PluginRegistry.Registrar registrar;
   public MethodChannel channel;
 
-  protected static final String LOG_TAG = "InAppBrowserFlutterPlugin";
+  protected static final String LOG_TAG = "InAppWebViewFlutterPlugin";
 
   public static InAppBrowser inAppBrowser;
   public static MyCookieManager myCookieManager;
   public static CredentialDatabaseHandler credentialDatabaseHandler;
   public static ValueCallback<Uri[]> uploadMessageArray;
 
-  public InAppBrowserFlutterPlugin() {}
+  public InAppWebViewFlutterPlugin() {}
 
   public static void registerWith(PluginRegistry.Registrar registrar) {
     inAppBrowser = new InAppBrowser(registrar);
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/JavaScriptBridgeInterface.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/JavaScriptBridgeInterface.java
similarity index 89%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/JavaScriptBridgeInterface.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/JavaScriptBridgeInterface.java
index 10f965e8..4ff43647 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/JavaScriptBridgeInterface.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/JavaScriptBridgeInterface.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.os.Build;
 import android.os.Handler;
@@ -7,10 +7,7 @@ import android.util.Log;
 import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
 
-import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebView;
-
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.pichillilorenzo.flutter_inappwebview.InAppWebView.InAppWebView;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +16,7 @@ import io.flutter.plugin.common.MethodChannel;
 
 public class JavaScriptBridgeInterface {
   private static final String LOG_TAG = "JSBridgeInterface";
-  public static final String name = "flutter_inappbrowser";
+  public static final String name = "flutter_inappwebview";
   private FlutterWebView flutterWebView;
   private InAppBrowserActivity inAppBrowserActivity;
 
@@ -47,7 +44,7 @@ public class JavaScriptBridgeInterface {
     obj.put("args", args);
 
     // java.lang.RuntimeException: Methods marked with @UiThread must be executed on the main thread.
-    // https://github.com/pichillilorenzo/flutter_inappbrowser/issues/98
+    // https://github.com/pichillilorenzo/flutter_inappwebview/issues/98
     final Handler handler = new Handler(Looper.getMainLooper());
     handler.post(new Runnable() {
       @Override
@@ -84,6 +81,6 @@ public class JavaScriptBridgeInterface {
   }
 
   private MethodChannel getChannel() {
-    return (inAppBrowserActivity != null) ? InAppBrowserFlutterPlugin.inAppBrowser.channel : flutterWebView.channel;
+    return (inAppBrowserActivity != null) ? InAppWebViewFlutterPlugin.inAppBrowser.channel : flutterWebView.channel;
   }
 }
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/MyCookieManager.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyCookieManager.java
similarity index 97%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/MyCookieManager.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyCookieManager.java
index 4c011e66..37e02c04 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/MyCookieManager.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyCookieManager.java
@@ -1,13 +1,10 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.os.Build;
-import android.util.Log;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 import android.webkit.ValueCallback;
 
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -30,7 +27,7 @@ public class MyCookieManager implements MethodChannel.MethodCallHandler {
 
   public MyCookieManager(PluginRegistry.Registrar r) {
     registrar = r;
-    channel = new MethodChannel(registrar.messenger(), "com.pichillilorenzo/flutter_inappbrowser_cookiemanager");
+    channel = new MethodChannel(registrar.messenger(), "com.pichillilorenzo/flutter_inappwebview_cookiemanager");
     channel.setMethodCallHandler(this);
     cookieManager = CookieManager.getInstance();
   }
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/Options.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Options.java
similarity index 96%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/Options.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Options.java
index db925b94..935a7d7b 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/Options.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Options.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.util.Log;
 
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/RequestPermissionHandler.java
similarity index 97%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/RequestPermissionHandler.java
index 18b7ff95..bcb1117e 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/RequestPermissionHandler.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.app.Activity;
 import android.content.pm.PackageManager;
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/Util.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Util.java
similarity index 98%
rename from android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/Util.java
rename to android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Util.java
index d2c0111b..02a308d0 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/Util.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Util.java
@@ -1,12 +1,10 @@
-package com.pichillilorenzo.flutter_inappbrowser;
+package com.pichillilorenzo.flutter_inappwebview;
 
 import android.content.res.AssetManager;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
-import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebView;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.Key;
diff --git a/android/src/main/res/layout/activity_web_view.xml b/android/src/main/res/layout/activity_web_view.xml
index ba38f899..996292d6 100644
--- a/android/src/main/res/layout/activity_web_view.xml
+++ b/android/src/main/res/layout/activity_web_view.xml
@@ -10,7 +10,7 @@
     tools:context=".InAppBrowserActivity"
     android:focusable="true">
 
-    <com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebView
+    <com.pichillilorenzo.flutter_inappwebview.InAppWebView.InAppWebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/example/README.md b/example/README.md
index a455ecd9..06eead02 100644
--- a/example/README.md
+++ b/example/README.md
@@ -1,6 +1,6 @@
-# flutter_inappbrowser_example
+# flutter_inappwebview_example
 
-Demonstrates how to use the flutter_inappbrowser plugin.
+Demonstrates how to use the flutter_inappwebview plugin.
 
 ## Getting Started
 
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 28464077..778cf26c 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -38,7 +38,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.pichillilorenzo.flutter_inappbrowserexample"
+        applicationId "com.pichillilorenzo.flutter_inappwebviewexample"
         minSdkVersion 17
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 8f3b3e5c..58ea0d3d 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
          FlutterApplication and put your custom class here. -->
     <application
         android:name=".MyApplication"
-        android:label="flutter_inappbrowser_example"
+        android:label="flutter_inappwebview_example"
         android:usesCleartextTraffic="true"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
index f6e144f7..73de065e 100755
--- a/example/ios/Flutter/flutter_export_environment.sh
+++ b/example/ios/Flutter/flutter_export_environment.sh
@@ -1,11 +1,10 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
 export "FLUTTER_ROOT=/Users/lorenzopichilli/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/lorenzopichilli/Desktop/flutter_inappbrowser/example"
-export "FLUTTER_TARGET=/Users/lorenzopichilli/Desktop/flutter_inappbrowser/example/lib/main.dart"
+export "FLUTTER_APPLICATION_PATH=/Users/lorenzopichilli/Desktop/flutter_inappwebview/example"
+export "FLUTTER_TARGET=/Users/lorenzopichilli/Desktop/flutter_inappwebview/example/test_driver/app.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build/ios"
 export "FLUTTER_FRAMEWORK_DIR=/Users/lorenzopichilli/flutter/bin/cache/artifacts/engine/ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
-export "TRACK_WIDGET_CREATION=true"
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index c698f1f9..48072898 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -269,14 +269,14 @@
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
 				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_downloader/flutter_downloader.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_inappbrowser/flutter_inappbrowser.framework",
+				"${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_downloader.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappbrowser.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -462,7 +462,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.pichillilorenzo.flutter_inappbrowserExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.pichillilorenzo.flutter_inappwebviewExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -490,7 +490,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.pichillilorenzo.flutter_inappbrowserExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.pichillilorenzo.flutter_inappwebviewExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
index 20ca57dc..a57480bf 100755
--- a/example/ios/Runner/Info.plist
+++ b/example/ios/Runner/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleName</key>
-	<string>flutter_inappbrowser_example</string>
+	<string>flutter_inappwebview_example</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleVersion</key>
diff --git a/example/lib/chrome_safari_browser_example.screen.dart b/example/lib/chrome_safari_browser_example.screen.dart
index ae974e32..a0607618 100644
--- a/example/lib/chrome_safari_browser_example.screen.dart
+++ b/example/lib/chrome_safari_browser_example.screen.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main.dart';
 
diff --git a/example/lib/in_app_browser_example.screen.dart b/example/lib/in_app_browser_example.screen.dart
index 7f99c928..53391d14 100644
--- a/example/lib/in_app_browser_example.screen.dart
+++ b/example/lib/in_app_browser_example.screen.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main.dart';
 
diff --git a/example/lib/in_app_webiew_example.screen.dart b/example/lib/in_app_webiew_example.screen.dart
index 1fc2cc0d..ff8df065 100755
--- a/example/lib/in_app_webiew_example.screen.dart
+++ b/example/lib/in_app_webiew_example.screen.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main.dart';
 
diff --git a/example/lib/main.dart b/example/lib/main.dart
index bd2dbf18..16db5f90 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -2,10 +2,10 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
-import 'package:flutter_inappbrowser_example/chrome_safari_browser_example.screen.dart';
-import 'package:flutter_inappbrowser_example/in_app_webiew_example.screen.dart';
-import 'package:flutter_inappbrowser_example/in_app_browser_example.screen.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:flutter_inappwebview_example/chrome_safari_browser_example.screen.dart';
+import 'package:flutter_inappwebview_example/in_app_webiew_example.screen.dart';
+import 'package:flutter_inappwebview_example/in_app_browser_example.screen.dart';
 
 // InAppLocalhostServer localhostServer = new InAppLocalhostServer();
 
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index f0cc4e74..2e016e73 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -1,5 +1,5 @@
-name: flutter_inappbrowser_example
-description: Demonstrates how to use the flutter_inappbrowser plugin.
+name: flutter_inappwebview_example
+description: Demonstrates how to use the flutter_inappwebview plugin.
 
 # The following defines the version and build number for your application.
 # A version number is three numbers separated by dots, like 1.2.43
@@ -22,7 +22,7 @@ dependencies:
   flutter_downloader: ^1.3.2
   path_provider: ^1.4.0
   permission_handler: ^3.3.0
-  flutter_inappbrowser:
+  flutter_inappwebview:
     path: ../
 
 dev_dependencies:
diff --git a/example/test_assets/in_app_webview_initial_file_test.html b/example/test_assets/in_app_webview_initial_file_test.html
index 443d98e9..c81fbe74 100644
--- a/example/test_assets/in_app_webview_initial_file_test.html
+++ b/example/test_assets/in_app_webview_initial_file_test.html
@@ -29,7 +29,7 @@
                 <p>
                     <img src="https://via.placeholder.com/100x50" alt="placeholder 100x50">
                 </p>
-                <a id="link" href="https://github.com/pichillilorenzo/flutter_inappbrowser">flutter_inappbrowser</a>
+                <a id="link" href="https://github.com/pichillilorenzo/flutter_inappwebview">flutter_inappwebview</a>
             </main>
         </div>
     </body>
diff --git a/example/test_assets/in_app_webview_javascript_handler_test.html b/example/test_assets/in_app_webview_javascript_handler_test.html
index 0c1803d5..863f170b 100644
--- a/example/test_assets/in_app_webview_javascript_handler_test.html
+++ b/example/test_assets/in_app_webview_javascript_handler_test.html
@@ -9,9 +9,9 @@
     <body>
         <h1>InAppWebViewJavaScriptHandlerTest</h1>
         <script>
-            window.addEventListener("flutterInAppBrowserPlatformReady", function(event) {
-                window.flutter_inappbrowser.callHandler('handlerFoo').then(function(result) {
-                    window.flutter_inappbrowser.callHandler('handlerFooWithArgs', 1, true, ['bar', 5], {foo: 'baz'}, result).then(function(result) {
+            window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
+                window.flutter_inappwebview.callHandler('handlerFoo').then(function(result) {
+                    window.flutter_inappwebview.callHandler('handlerFooWithArgs', 1, true, ['bar', 5], {foo: 'baz'}, result).then(function(result) {
 
                     });
                 });
diff --git a/example/test_assets/in_app_webview_on_js_dialog_test.html b/example/test_assets/in_app_webview_on_js_dialog_test.html
index a234f0ef..6a2d93f0 100644
--- a/example/test_assets/in_app_webview_on_js_dialog_test.html
+++ b/example/test_assets/in_app_webview_on_js_dialog_test.html
@@ -9,10 +9,10 @@
     <body>
         <h1>InAppWebViewOnJsDialogTest</h1>
         <script>
-            window.addEventListener("flutterInAppBrowserPlatformReady", function(event) {
+            window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
                 alert("alert message");
-                window.flutter_inappbrowser.callHandler('confirm', confirm("confirm message"));
-                window.flutter_inappbrowser.callHandler('prompt', prompt("prompt message", "prompt default value"));
+                window.flutter_inappwebview.callHandler('confirm', confirm("confirm message"));
+                window.flutter_inappwebview.callHandler('prompt', prompt("prompt message", "prompt default value"));
             });
         </script>
     </body>
diff --git a/example/test_assets/in_app_webview_on_load_resource_custom_scheme_test.html b/example/test_assets/in_app_webview_on_load_resource_custom_scheme_test.html
index 995b7094..663ff9a6 100644
--- a/example/test_assets/in_app_webview_on_load_resource_custom_scheme_test.html
+++ b/example/test_assets/in_app_webview_on_load_resource_custom_scheme_test.html
@@ -17,7 +17,7 @@
     <script>
         var image = document.querySelector("#image");
         image.addEventListener('load', function() {
-            window.flutter_inappbrowser.callHandler('imageLoaded');
+            window.flutter_inappwebview.callHandler('imageLoaded');
         });
     </script>
 </html>
\ No newline at end of file
diff --git a/example/test_assets/in_app_webview_on_navigation_state_change_test.html b/example/test_assets/in_app_webview_on_navigation_state_change_test.html
index 36f3e58e..4db56fdb 100644
--- a/example/test_assets/in_app_webview_on_navigation_state_change_test.html
+++ b/example/test_assets/in_app_webview_on_navigation_state_change_test.html
@@ -10,7 +10,7 @@
     <body>
         <h1>InAppWebViewOnNavigationStateChangeTest</h1>
         <script>
-            window.addEventListener("flutterInAppBrowserPlatformReady", function(event) {
+            window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
                 var state = {}
                 var title = ''
                 var url = 'first-push';
diff --git a/example/test_assets/index.html b/example/test_assets/index.html
index ffd2f648..26188d6d 100644
--- a/example/test_assets/index.html
+++ b/example/test_assets/index.html
@@ -77,9 +77,9 @@
             window.location = "#foo-" + randomNumber;
         }
 
-        window.addEventListener("flutterInAppBrowserPlatformReady", function(event) {
-            window.flutter_inappbrowser.callHandler('handlerFoo').then(function(result) {
-                window.flutter_inappbrowser.callHandler('handlerFooWithArgs', 1, true, ['bar', 5], {foo: 'baz'}, result).then(function(result) {
+        window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
+            window.flutter_inappwebview.callHandler('handlerFoo').then(function(result) {
+                window.flutter_inappwebview.callHandler('handlerFooWithArgs', 1, true, ['bar', 5], {foo: 'baz'}, result).then(function(result) {
 
                 });
             });
diff --git a/example/test_driver/custom_widget_test.dart b/example/test_driver/custom_widget_test.dart
index 7cd5486a..1115fd09 100644
--- a/example/test_driver/custom_widget_test.dart
+++ b/example/test_driver/custom_widget_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 class WidgetTest extends StatefulWidget {
   final WidgetTestState state = WidgetTestState();
diff --git a/example/test_driver/in_app_webview_ajax_test.dart b/example/test_driver/in_app_webview_ajax_test.dart
index b844ed26..108c56bf 100644
--- a/example/test_driver/in_app_webview_ajax_test.dart
+++ b/example/test_driver/in_app_webview_ajax_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
@@ -41,7 +41,7 @@ class InAppWebViewAjaxTestState extends WidgetTestState {
     <body>
         <h1>InAppWebViewAjaxTest</h1>
         <script>
-          window.addEventListener('flutterInAppBrowserPlatformReady', function(event) {
+          window.addEventListener('flutterInAppWebViewPlatformReady', function(event) {
             var xhttp = new XMLHttpRequest();
             xhttp.open("POST", "http://${environment["NODE_SERVER_IP"]}:8082/test-ajax-post");
             xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
diff --git a/example/test_driver/in_app_webview_content_blocker_test.dart b/example/test_driver/in_app_webview_content_blocker_test.dart
index c3da3895..221c23d1 100644
--- a/example/test_driver/in_app_webview_content_blocker_test.dart
+++ b/example/test_driver/in_app_webview_content_blocker_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_cookie_manager_test.dart b/example/test_driver/in_app_webview_cookie_manager_test.dart
index fb7358fe..8ed77e53 100644
--- a/example/test_driver/in_app_webview_cookie_manager_test.dart
+++ b/example/test_driver/in_app_webview_cookie_manager_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_fetch_test.dart b/example/test_driver/in_app_webview_fetch_test.dart
index bb982933..fe03e2c7 100644
--- a/example/test_driver/in_app_webview_fetch_test.dart
+++ b/example/test_driver/in_app_webview_fetch_test.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
@@ -43,11 +43,11 @@ class InAppWebViewFetchTestState extends WidgetTestState {
     <body>
         <h1>InAppWebViewFetchTest</h1>
         <script>
-          window.addEventListener('flutterInAppBrowserPlatformReady', function(event) {
+          window.addEventListener('flutterInAppWebViewPlatformReady', function(event) {
             fetch(new Request("http://${environment["NODE_SERVER_IP"]}:8082/test-download-file")).then(function(response) {
-                window.flutter_inappbrowser.callHandler('fetchGet', response.status);
+                window.flutter_inappwebview.callHandler('fetchGet', response.status);
             }).catch(function(error) {
-                window.flutter_inappbrowser.callHandler('fetchGet', "ERROR: " + error);
+                window.flutter_inappwebview.callHandler('fetchGet', "ERROR: " + error);
             });
 
             fetch("http://${environment["NODE_SERVER_IP"]}:8082/test-ajax-post", {
@@ -61,12 +61,12 @@ class InAppWebViewFetchTestState extends WidgetTestState {
                 }
             }).then(function(response) {
                 response.json().then(function(value) {
-					window.flutter_inappbrowser.callHandler('fetchPost', value);
+					window.flutter_inappwebview.callHandler('fetchPost', value);
 				}).catch(function(error) {
-				    window.flutter_inappbrowser.callHandler('fetchPost', "ERROR: " + error);
+				    window.flutter_inappwebview.callHandler('fetchPost', "ERROR: " + error);
 				});
             }).catch(function(error) {
-                window.flutter_inappbrowser.callHandler('fetchPost', "ERROR: " + error);
+                window.flutter_inappwebview.callHandler('fetchPost', "ERROR: " + error);
             });
           });
         </script>
diff --git a/example/test_driver/in_app_webview_http_auth_credential_database_test.dart b/example/test_driver/in_app_webview_http_auth_credential_database_test.dart
index 22fb435a..60293d8c 100644
--- a/example/test_driver/in_app_webview_http_auth_credential_database_test.dart
+++ b/example/test_driver/in_app_webview_http_auth_credential_database_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_initial_data_test.dart b/example/test_driver/in_app_webview_initial_data_test.dart
index c9e55ce6..9a2431d1 100644
--- a/example/test_driver/in_app_webview_initial_data_test.dart
+++ b/example/test_driver/in_app_webview_initial_data_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
@@ -58,7 +58,7 @@ class InAppWebViewInitialDataTestState extends WidgetTestState {
                 <p>
                     <img src="https://via.placeholder.com/100x50" alt="placeholder 100x50">
                 </p>
-                <a id="link" href="https://github.com/pichillilorenzo/flutter_inappbrowser">flutter_inappbrowser</a>
+                <a id="link" href="https://github.com/pichillilorenzo/flutter_inappwebview">flutter_inappwebview</a>
             </main>
         </div>
     </body>
diff --git a/example/test_driver/in_app_webview_initial_file_test.dart b/example/test_driver/in_app_webview_initial_file_test.dart
index b4d3839d..abe6df38 100644
--- a/example/test_driver/in_app_webview_initial_file_test.dart
+++ b/example/test_driver/in_app_webview_initial_file_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
diff --git a/example/test_driver/in_app_webview_initial_url_test.dart b/example/test_driver/in_app_webview_initial_url_test.dart
index 1e3f8ffb..bf3e6258 100644
--- a/example/test_driver/in_app_webview_initial_url_test.dart
+++ b/example/test_driver/in_app_webview_initial_url_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_javascript_handler_test.dart b/example/test_driver/in_app_webview_javascript_handler_test.dart
index 7a7c320f..a5833a8a 100644
--- a/example/test_driver/in_app_webview_javascript_handler_test.dart
+++ b/example/test_driver/in_app_webview_javascript_handler_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
diff --git a/example/test_driver/in_app_webview_on_console_message_test.dart b/example/test_driver/in_app_webview_on_console_message_test.dart
index 6ff03025..0a001317 100644
--- a/example/test_driver/in_app_webview_on_console_message_test.dart
+++ b/example/test_driver/in_app_webview_on_console_message_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
diff --git a/example/test_driver/in_app_webview_on_download_start_test.dart b/example/test_driver/in_app_webview_on_download_start_test.dart
index 65debb57..cb688262 100644
--- a/example/test_driver/in_app_webview_on_download_start_test.dart
+++ b/example/test_driver/in_app_webview_on_download_start_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
@@ -40,7 +40,7 @@ class InAppWebViewOnDownloadStartTestState extends WidgetTestState {
         <h1>InAppWebViewOnDownloadStartTest</h1>
         <a id="download-file" href="http://${environment["NODE_SERVER_IP"]}:8082/test-download-file">download file</a>
         <script>
-            window.addEventListener("flutterInAppBrowserPlatformReady", function(event) {
+            window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
                 document.querySelector("#download-file").click();
             });
         </script>
diff --git a/example/test_driver/in_app_webview_on_find_result_received_test.dart b/example/test_driver/in_app_webview_on_find_result_received_test.dart
index 8df5f414..a6d0262f 100644
--- a/example/test_driver/in_app_webview_on_find_result_received_test.dart
+++ b/example/test_driver/in_app_webview_on_find_result_received_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
diff --git a/example/test_driver/in_app_webview_on_js_dialog_test.dart b/example/test_driver/in_app_webview_on_js_dialog_test.dart
index 944bbb2c..bb52dd1b 100644
--- a/example/test_driver/in_app_webview_on_js_dialog_test.dart
+++ b/example/test_driver/in_app_webview_on_js_dialog_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
diff --git a/example/test_driver/in_app_webview_on_load_error_test.dart b/example/test_driver/in_app_webview_on_load_error_test.dart
index aa59d9da..4a4bf8ae 100644
--- a/example/test_driver/in_app_webview_on_load_error_test.dart
+++ b/example/test_driver/in_app_webview_on_load_error_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_on_load_http_error_test.dart b/example/test_driver/in_app_webview_on_load_http_error_test.dart
index fa4d09df..6a7d1de1 100644
--- a/example/test_driver/in_app_webview_on_load_http_error_test.dart
+++ b/example/test_driver/in_app_webview_on_load_http_error_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_on_load_resource_custom_scheme_test.dart b/example/test_driver/in_app_webview_on_load_resource_custom_scheme_test.dart
index eb9e6114..a1b8283f 100644
--- a/example/test_driver/in_app_webview_on_load_resource_custom_scheme_test.dart
+++ b/example/test_driver/in_app_webview_on_load_resource_custom_scheme_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
diff --git a/example/test_driver/in_app_webview_on_load_resource_test.dart b/example/test_driver/in_app_webview_on_load_resource_test.dart
index 100a24a4..15a7260b 100644
--- a/example/test_driver/in_app_webview_on_load_resource_test.dart
+++ b/example/test_driver/in_app_webview_on_load_resource_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
diff --git a/example/test_driver/in_app_webview_on_navigation_state_change_test.dart b/example/test_driver/in_app_webview_on_navigation_state_change_test.dart
index ea41666e..aede944a 100644
--- a/example/test_driver/in_app_webview_on_navigation_state_change_test.dart
+++ b/example/test_driver/in_app_webview_on_navigation_state_change_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
diff --git a/example/test_driver/in_app_webview_on_progress_changed_test.dart b/example/test_driver/in_app_webview_on_progress_changed_test.dart
index dcaf2f1b..eb303493 100644
--- a/example/test_driver/in_app_webview_on_progress_changed_test.dart
+++ b/example/test_driver/in_app_webview_on_progress_changed_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_on_received_http_auth_request_test.dart b/example/test_driver/in_app_webview_on_received_http_auth_request_test.dart
index c868c802..ec58dd7d 100644
--- a/example/test_driver/in_app_webview_on_received_http_auth_request_test.dart
+++ b/example/test_driver/in_app_webview_on_received_http_auth_request_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_on_safe_browsing_hit_test.dart b/example/test_driver/in_app_webview_on_safe_browsing_hit_test.dart
index f9a4fdd6..d4698e47 100644
--- a/example/test_driver/in_app_webview_on_safe_browsing_hit_test.dart
+++ b/example/test_driver/in_app_webview_on_safe_browsing_hit_test.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_on_scroll_changed_test.dart b/example/test_driver/in_app_webview_on_scroll_changed_test.dart
index c2bde6e3..ab1af7e5 100644
--- a/example/test_driver/in_app_webview_on_scroll_changed_test.dart
+++ b/example/test_driver/in_app_webview_on_scroll_changed_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_on_target_blank_test.dart b/example/test_driver/in_app_webview_on_target_blank_test.dart
index 966375f5..7eedd25d 100644
--- a/example/test_driver/in_app_webview_on_target_blank_test.dart
+++ b/example/test_driver/in_app_webview_on_target_blank_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'main_test.dart';
 import 'custom_widget_test.dart';
diff --git a/example/test_driver/in_app_webview_should_override_url_loading_test.dart b/example/test_driver/in_app_webview_should_override_url_loading_test.dart
index e5004ce5..5fe674a4 100644
--- a/example/test_driver/in_app_webview_should_override_url_loading_test.dart
+++ b/example/test_driver/in_app_webview_should_override_url_loading_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/example/test_driver/in_app_webview_ssl_request_test.dart b/example/test_driver/in_app_webview_ssl_request_test.dart
index 837ca232..5d8b7625 100644
--- a/example/test_driver/in_app_webview_ssl_request_test.dart
+++ b/example/test_driver/in_app_webview_ssl_request_test.dart
@@ -1,8 +1,6 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 
-import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 import 'custom_widget_test.dart';
 import 'main_test.dart';
diff --git a/flutter_inappbrowser.iml b/flutter_inappwebview.iml
similarity index 94%
rename from flutter_inappbrowser.iml
rename to flutter_inappwebview.iml
index d81a44d5..c166a1d3 100644
--- a/flutter_inappbrowser.iml
+++ b/flutter_inappwebview.iml
@@ -20,6 +20,7 @@
       <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_inappbrowser/example/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_inappbrowser/example/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_inappbrowser/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_inappbrowser/example/ios/Flutter/App.framework/flutter_assets/packages" />
       <excludeFolder url="file://$MODULE_DIR$/example/ios/Flutter/App.framework/flutter_assets/packages" />
       <excludeFolder url="file://$MODULE_DIR$/flutter_inappbrowser_tests/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/flutter_inappbrowser_tests/.pub" />
diff --git a/flutter_inappbrowser_android.iml b/flutter_inappwebview_android.iml
similarity index 100%
rename from flutter_inappbrowser_android.iml
rename to flutter_inappwebview_android.iml
diff --git a/ios/Classes/CredentialDatabase.swift b/ios/Classes/CredentialDatabase.swift
index 21d01565..16a296a3 100644
--- a/ios/Classes/CredentialDatabase.swift
+++ b/ios/Classes/CredentialDatabase.swift
@@ -1,6 +1,6 @@
 //
 //  CredentialDatabase.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo Pichilli on 29/10/2019.
 //
@@ -22,7 +22,7 @@ class CredentialDatabase: NSObject, FlutterPlugin {
         CredentialDatabase.registrar = registrar
         CredentialDatabase.credentialStore = URLCredentialStorage.shared
         
-        CredentialDatabase.channel = FlutterMethodChannel(name: "com.pichillilorenzo/flutter_inappbrowser_credential_database", binaryMessenger: registrar.messenger())
+        CredentialDatabase.channel = FlutterMethodChannel(name: "com.pichillilorenzo/flutter_inappwebview_credential_database", binaryMessenger: registrar.messenger())
         registrar.addMethodCallDelegate(self, channel: CredentialDatabase.channel!)
     }
 
diff --git a/ios/Classes/CustomeSchemeHandler.swift b/ios/Classes/CustomeSchemeHandler.swift
index 64ee0fe7..0704b6fe 100644
--- a/ios/Classes/CustomeSchemeHandler.swift
+++ b/ios/Classes/CustomeSchemeHandler.swift
@@ -1,6 +1,6 @@
 //
 //  CustomeSchemeHandler.swift
-//  flutter_downloader
+//  flutter_inappwebview
 //
 //  Created by Lorenzo Pichilli on 25/10/2019.
 //
diff --git a/ios/Classes/FlutterWebViewController.swift b/ios/Classes/FlutterWebViewController.swift
index 27190d9e..66edfe64 100755
--- a/ios/Classes/FlutterWebViewController.swift
+++ b/ios/Classes/FlutterWebViewController.swift
@@ -1,6 +1,6 @@
 //
 //  FlutterWebViewController.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo on 13/11/18.
 //
diff --git a/ios/Classes/FlutterWebViewFactory.swift b/ios/Classes/FlutterWebViewFactory.swift
index d910e57c..181441f0 100755
--- a/ios/Classes/FlutterWebViewFactory.swift
+++ b/ios/Classes/FlutterWebViewFactory.swift
@@ -1,6 +1,6 @@
 //
 //  FlutterWebViewFactory.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo on 13/11/18.
 //
diff --git a/ios/Classes/InAppBrowserOptions.swift b/ios/Classes/InAppBrowserOptions.swift
index 6c6596cf..5e4ab7ff 100755
--- a/ios/Classes/InAppBrowserOptions.swift
+++ b/ios/Classes/InAppBrowserOptions.swift
@@ -1,6 +1,6 @@
 //
 //  InAppBrowserOptions.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo on 17/09/18.
 //
diff --git a/ios/Classes/InAppBrowserWebViewController.swift b/ios/Classes/InAppBrowserWebViewController.swift
index f5622ec2..152172c6 100755
--- a/ios/Classes/InAppBrowserWebViewController.swift
+++ b/ios/Classes/InAppBrowserWebViewController.swift
@@ -1,6 +1,6 @@
 //
 //  InAppBrowserWebViewController.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo on 17/09/18.
 //
diff --git a/ios/Classes/InAppWebView.swift b/ios/Classes/InAppWebView.swift
index c7510fe0..c489cb08 100755
--- a/ios/Classes/InAppWebView.swift
+++ b/ios/Classes/InAppWebView.swift
@@ -1,6 +1,6 @@
 //
 //  InAppWebView.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo on 21/10/18.
 //
@@ -39,7 +39,7 @@ func JSONStringify(value: Any, prettyPrinted: Bool = false) -> String {
     return ""
 }
 
-let JAVASCRIPT_BRIDGE_NAME = "flutter_inappbrowser"
+let JAVASCRIPT_BRIDGE_NAME = "flutter_inappwebview"
 
 // the message needs to be concatenated with '' in order to have the same behavior like on Android
 let consoleLogJS = """
@@ -82,7 +82,7 @@ window.\(JAVASCRIPT_BRIDGE_NAME).callHandler = function() {
 }
 """
 
-let platformReadyJS = "window.dispatchEvent(new Event('flutterInAppBrowserPlatformReady'));";
+let platformReadyJS = "window.dispatchEvent(new Event('flutterInAppWebViewPlatformReady'));";
 
 let findTextHighlightJS = """
 var wkwebview_SearchResultCount = 0;
@@ -234,7 +234,7 @@ function wkwebview_FindNext(forward) {
 }
 """
 
-let variableForOnLoadResourceJS = "window._flutter_inappbrowser_useOnLoadResource"
+let variableForOnLoadResourceJS = "window._flutter_inappwebview_useOnLoadResource"
 let enableVariableForOnLoadResourceJS = "\(variableForOnLoadResourceJS) = $PLACEHOLDER_VALUE;"
 
 let resourceObserverJS = """
@@ -250,7 +250,7 @@ let resourceObserverJS = """
 })();
 """
 
-let variableForShouldInterceptAjaxRequestJS = "window._flutter_inappbrowser_useShouldInterceptAjaxRequest"
+let variableForShouldInterceptAjaxRequestJS = "window._flutter_inappwebview_useShouldInterceptAjaxRequest"
 let enableVariableForShouldInterceptAjaxRequestJS = "\(variableForShouldInterceptAjaxRequestJS) = $PLACEHOLDER_VALUE;"
 
 let interceptAjaxRequestsJS = """
@@ -258,14 +258,14 @@ let interceptAjaxRequestsJS = """
   var send = ajax.prototype.send;
   var open = ajax.prototype.open;
   var setRequestHeader = ajax.prototype.setRequestHeader;
-  ajax.prototype._flutter_inappbrowser_url = null;
-  ajax.prototype._flutter_inappbrowser_method = null;
-  ajax.prototype._flutter_inappbrowser_isAsync = null;
-  ajax.prototype._flutter_inappbrowser_user = null;
-  ajax.prototype._flutter_inappbrowser_password = null;
-  ajax.prototype._flutter_inappbrowser_password = null;
-  ajax.prototype._flutter_inappbrowser_already_onreadystatechange_wrapped = false;
-  ajax.prototype._flutter_inappbrowser_request_headers = {};
+  ajax.prototype._flutter_inappwebview_url = null;
+  ajax.prototype._flutter_inappwebview_method = null;
+  ajax.prototype._flutter_inappwebview_isAsync = null;
+  ajax.prototype._flutter_inappwebview_user = null;
+  ajax.prototype._flutter_inappwebview_password = null;
+  ajax.prototype._flutter_inappwebview_password = null;
+  ajax.prototype._flutter_inappwebview_already_onreadystatechange_wrapped = false;
+  ajax.prototype._flutter_inappwebview_request_headers = {};
   function convertRequestResponse(request, callback) {
     if (request.response != null && request.responseType != null) {
       switch (request.responseType) {
@@ -291,16 +291,16 @@ let interceptAjaxRequestsJS = """
   };
   ajax.prototype.open = function(method, url, isAsync, user, password) {
     isAsync = (isAsync != null) ? isAsync : true;
-    this._flutter_inappbrowser_url = url;
-    this._flutter_inappbrowser_method = method;
-    this._flutter_inappbrowser_isAsync = isAsync;
-    this._flutter_inappbrowser_user = user;
-    this._flutter_inappbrowser_password = password;
-    this._flutter_inappbrowser_request_headers = {};
+    this._flutter_inappwebview_url = url;
+    this._flutter_inappwebview_method = method;
+    this._flutter_inappwebview_isAsync = isAsync;
+    this._flutter_inappwebview_user = user;
+    this._flutter_inappwebview_password = password;
+    this._flutter_inappwebview_request_headers = {};
     open.call(this, method, url, isAsync, user, password);
   };
   ajax.prototype.setRequestHeader = function(header, value) {
-    this._flutter_inappbrowser_request_headers[header] = value;
+    this._flutter_inappwebview_request_headers[header] = value;
     setRequestHeader.call(this, header, value);
   };
   function handleEvent(e) {
@@ -319,13 +319,13 @@ let interceptAjaxRequestsJS = """
       }
       convertRequestResponse(this, function(response) {
         var ajaxRequest = {
-          method: self._flutter_inappbrowser_method,
-          url: self._flutter_inappbrowser_url,
-          isAsync: self._flutter_inappbrowser_isAsync,
-          user: self._flutter_inappbrowser_user,
-          password: self._flutter_inappbrowser_password,
+          method: self._flutter_inappwebview_method,
+          url: self._flutter_inappwebview_url,
+          isAsync: self._flutter_inappwebview_isAsync,
+          user: self._flutter_inappwebview_user,
+          password: self._flutter_inappwebview_password,
           withCredentials: self.withCredentials,
-          headers: self._flutter_inappbrowser_request_headers,
+          headers: self._flutter_inappwebview_request_headers,
           readyState: self.readyState,
           status: self.status,
           responseURL: self.responseURL,
@@ -357,8 +357,8 @@ let interceptAjaxRequestsJS = """
   ajax.prototype.send = function(data) {
     var self = this;
     if (window.\(variableForShouldInterceptAjaxRequestJS) == null || window.\(variableForShouldInterceptAjaxRequestJS) == true) {
-      if (!this._flutter_inappbrowser_already_onreadystatechange_wrapped) {
-        this._flutter_inappbrowser_already_onreadystatechange_wrapped = true;
+      if (!this._flutter_inappwebview_already_onreadystatechange_wrapped) {
+        this._flutter_inappwebview_already_onreadystatechange_wrapped = true;
         var onreadystatechange = this.onreadystatechange;
         this.onreadystatechange = function() {
           if (window.\(variableForShouldInterceptAjaxRequestJS) == null || window.\(variableForShouldInterceptAjaxRequestJS) == true) {
@@ -375,13 +375,13 @@ let interceptAjaxRequestsJS = """
             }
             convertRequestResponse(this, function(response) {
               var ajaxRequest = {
-                method: self._flutter_inappbrowser_method,
-                url: self._flutter_inappbrowser_url,
-                isAsync: self._flutter_inappbrowser_isAsync,
-                user: self._flutter_inappbrowser_user,
-                password: self._flutter_inappbrowser_password,
+                method: self._flutter_inappwebview_method,
+                url: self._flutter_inappwebview_url,
+                isAsync: self._flutter_inappwebview_isAsync,
+                user: self._flutter_inappwebview_user,
+                password: self._flutter_inappwebview_password,
                 withCredentials: self.withCredentials,
-                headers: self._flutter_inappbrowser_request_headers,
+                headers: self._flutter_inappwebview_request_headers,
                 readyState: self.readyState,
                 status: self.status,
                 responseURL: self.responseURL,
@@ -419,13 +419,13 @@ let interceptAjaxRequestsJS = """
       this.addEventListener('timeout', handleEvent);
       var ajaxRequest = {
         data: data,
-        method: this._flutter_inappbrowser_method,
-        url: this._flutter_inappbrowser_url,
-        isAsync: this._flutter_inappbrowser_isAsync,
-        user: this._flutter_inappbrowser_user,
-        password: this._flutter_inappbrowser_password,
+        method: this._flutter_inappwebview_method,
+        url: this._flutter_inappwebview_url,
+        isAsync: this._flutter_inappwebview_isAsync,
+        user: this._flutter_inappwebview_user,
+        password: this._flutter_inappwebview_password,
         withCredentials: this.withCredentials,
-        headers: this._flutter_inappbrowser_request_headers,
+        headers: this._flutter_inappwebview_request_headers,
         responseType: this.responseType
       };
       window.\(JAVASCRIPT_BRIDGE_NAME).callHandler('shouldInterceptAjaxRequest', ajaxRequest).then(function(result) {
@@ -442,15 +442,15 @@ let interceptAjaxRequestsJS = """
           };
           for (var header in result.headers) {
             var value = result.headers[header];
-            var flutter_inappbrowser_value = self._flutter_inappbrowser_request_headers[header];
-            if (flutter_inappbrowser_value == null) {
-              self._flutter_inappbrowser_request_headers[header] = value;
+            var flutter_inappwebview_value = self._flutter_inappwebview_request_headers[header];
+            if (flutter_inappwebview_value == null) {
+              self._flutter_inappwebview_request_headers[header] = value;
             } else {
-              self._flutter_inappbrowser_request_headers[header] += ', ' + value;
+              self._flutter_inappwebview_request_headers[header] += ', ' + value;
             }
             setRequestHeader.call(self, header, value);
           };
-          if ((self._flutter_inappbrowser_method != result.method && result.method != null) || (self._flutter_inappbrowser_url != result.url && result.url != null)) {
+          if ((self._flutter_inappwebview_method != result.method && result.method != null) || (self._flutter_inappwebview_url != result.url && result.url != null)) {
             self.abort();
             self.open(result.method, result.url, result.isAsync, result.user, result.password);
             return;
@@ -465,7 +465,7 @@ let interceptAjaxRequestsJS = """
 })(window.XMLHttpRequest);
 """
 
-let variableForShouldInterceptFetchRequestsJS = "window._flutter_inappbrowser_useShouldInterceptFetchRequest"
+let variableForShouldInterceptFetchRequestsJS = "window._flutter_inappwebview_useShouldInterceptFetchRequest"
 let enableVariableForShouldInterceptFetchRequestsJS = "\(variableForShouldInterceptFetchRequestsJS) = $PLACEHOLDER_VALUE;"
 
 let interceptFetchRequestsJS = """
@@ -656,7 +656,7 @@ let interceptNavigationStateChangeJS = """
     return function pushState(){
       var ret = f.apply(this, arguments);
       window.dispatchEvent(new Event('pushstate'));
-      window.dispatchEvent(new Event('_flutter_inappbrowser_locationchange'));
+      window.dispatchEvent(new Event('_flutter_inappwebview_locationchange'));
       return ret;
     };
   })(history.pushState);
@@ -664,14 +664,14 @@ let interceptNavigationStateChangeJS = """
     return function replaceState(){
       var ret = f.apply(this, arguments);
       window.dispatchEvent(new Event('replacestate'));
-      window.dispatchEvent(new Event('_flutter_inappbrowser_locationchange'));
+      window.dispatchEvent(new Event('_flutter_inappwebview_locationchange'));
       return ret;
     };
   })(history.replaceState);
   window.addEventListener('popstate',function() {
-    window.dispatchEvent(new Event('_flutter_inappbrowser_locationchange'));
+    window.dispatchEvent(new Event('_flutter_inappwebview_locationchange'));
   });
-  window.addEventListener('_flutter_inappbrowser_locationchange', function() {
+  window.addEventListener('_flutter_inappwebview_locationchange', function() {
     window.webkit.messageHandlers["onNavigationStateChange"].postMessage(JSON.stringify({
       url: document.location.href
     }));
diff --git a/ios/Classes/InAppBrowserFlutterPlugin.h b/ios/Classes/InAppWebViewFlutterPlugin.h
old mode 100755
new mode 100644
similarity index 93%
rename from ios/Classes/InAppBrowserFlutterPlugin.h
rename to ios/Classes/InAppWebViewFlutterPlugin.h
index 7bb0e655..cb448aa0
--- a/ios/Classes/InAppBrowserFlutterPlugin.h
+++ b/ios/Classes/InAppWebViewFlutterPlugin.h
@@ -17,7 +17,7 @@
 
 #import <Flutter/Flutter.h>
 
-@interface InAppBrowserFlutterPlugin : NSObject<FlutterPlugin>
+@interface InAppWebViewFlutterPlugin : NSObject<FlutterPlugin>
 + (void)registerWithRegistrar:(nonnull NSObject<FlutterPluginRegistrar> *)registrar;
 
 @end
diff --git a/ios/Classes/InAppBrowserFlutterPlugin.m b/ios/Classes/InAppWebViewFlutterPlugin.m
old mode 100755
new mode 100644
similarity index 85%
rename from ios/Classes/InAppBrowserFlutterPlugin.m
rename to ios/Classes/InAppWebViewFlutterPlugin.m
index 1b11d037..f245b8a0
--- a/ios/Classes/InAppBrowserFlutterPlugin.m
+++ b/ios/Classes/InAppWebViewFlutterPlugin.m
@@ -15,10 +15,10 @@
  under the License.
  */
 
-#import "InAppBrowserFlutterPlugin.h"
-#import <flutter_inappbrowser/flutter_inappbrowser-Swift.h>
+#import "InAppWebViewFlutterPlugin.h"
+#import <flutter_inappwebview/flutter_inappwebview-Swift.h>
 
-@implementation InAppBrowserFlutterPlugin : NSObject
+@implementation InAppWebViewFlutterPlugin : NSObject
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
     [SwiftFlutterPlugin registerWithRegistrar:registrar];
 }
diff --git a/ios/Classes/InAppWebViewOptions.swift b/ios/Classes/InAppWebViewOptions.swift
index 4755e654..67f129d6 100755
--- a/ios/Classes/InAppWebViewOptions.swift
+++ b/ios/Classes/InAppWebViewOptions.swift
@@ -1,6 +1,6 @@
 //
 //  InAppWebViewOptions.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo on 21/10/18.
 //
diff --git a/ios/Classes/MyCookieManager.swift b/ios/Classes/MyCookieManager.swift
index 4a7d5e08..5c44171f 100755
--- a/ios/Classes/MyCookieManager.swift
+++ b/ios/Classes/MyCookieManager.swift
@@ -1,6 +1,6 @@
 //
 //  MyCookieManager.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo on 26/10/18.
 //
@@ -24,7 +24,7 @@ class MyCookieManager: NSObject, FlutterPlugin {
         MyCookieManager.registrar = registrar
         MyCookieManager.httpCookieStore = WKWebsiteDataStore.default().httpCookieStore
         
-        MyCookieManager.channel = FlutterMethodChannel(name: "com.pichillilorenzo/flutter_inappbrowser_cookiemanager", binaryMessenger: registrar.messenger())
+        MyCookieManager.channel = FlutterMethodChannel(name: "com.pichillilorenzo/flutter_inappwebview_cookiemanager", binaryMessenger: registrar.messenger())
         registrar.addMethodCallDelegate(self, channel: MyCookieManager.channel!)
     }
     
diff --git a/ios/Classes/Options.swift b/ios/Classes/Options.swift
index ddde934e..c4b355ea 100755
--- a/ios/Classes/Options.swift
+++ b/ios/Classes/Options.swift
@@ -1,6 +1,6 @@
 //
 //  Options.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo on 26/09/18.
 //
diff --git a/ios/Classes/SafariBrowserOptions.swift b/ios/Classes/SafariBrowserOptions.swift
index cc8e0676..714beded 100755
--- a/ios/Classes/SafariBrowserOptions.swift
+++ b/ios/Classes/SafariBrowserOptions.swift
@@ -1,6 +1,6 @@
 //
 //  SafariBrowserOptions.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo on 26/09/18.
 //
diff --git a/ios/Classes/SafariViewController.swift b/ios/Classes/SafariViewController.swift
index 4abe0db6..0dfbc4b7 100755
--- a/ios/Classes/SafariViewController.swift
+++ b/ios/Classes/SafariViewController.swift
@@ -1,6 +1,6 @@
 //
 //  SafariViewController.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo on 25/09/18.
 //
diff --git a/ios/Classes/SwiftFlutterPlugin.swift b/ios/Classes/SwiftFlutterPlugin.swift
index 1373934e..f4992671 100755
--- a/ios/Classes/SwiftFlutterPlugin.swift
+++ b/ios/Classes/SwiftFlutterPlugin.swift
@@ -428,7 +428,7 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin {
             webViewOptions.parse(options: options)
         }
         
-        let storyboard = UIStoryboard(name: WEBVIEW_STORYBOARD, bundle: Bundle(for: InAppBrowserFlutterPlugin.self))
+        let storyboard = UIStoryboard(name: WEBVIEW_STORYBOARD, bundle: Bundle(for: InAppWebViewFlutterPlugin.self))
         let vc = storyboard.instantiateViewController(withIdentifier: WEBVIEW_STORYBOARD_CONTROLLER_ID)
         self.webViewControllers[uuid] = vc as? InAppBrowserWebViewController
         let webViewController: InAppBrowserWebViewController = self.webViewControllers[uuid] as! InAppBrowserWebViewController
@@ -495,7 +495,7 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin {
         webViewOptions = InAppWebViewOptions()
         webViewOptions.parse(options: options)
         
-        let storyboard = UIStoryboard(name: WEBVIEW_STORYBOARD, bundle: Bundle(for: InAppBrowserFlutterPlugin.self))
+        let storyboard = UIStoryboard(name: WEBVIEW_STORYBOARD, bundle: Bundle(for: InAppWebViewFlutterPlugin.self))
         let vc = storyboard.instantiateViewController(withIdentifier: WEBVIEW_STORYBOARD_CONTROLLER_ID)
         self.webViewControllers[uuid] = vc as? InAppBrowserWebViewController
         let webViewController: InAppBrowserWebViewController = self.webViewControllers[uuid] as! InAppBrowserWebViewController
diff --git a/ios/Classes/WKProcessPoolManager.swift b/ios/Classes/WKProcessPoolManager.swift
index 55519583..84dc8485 100644
--- a/ios/Classes/WKProcessPoolManager.swift
+++ b/ios/Classes/WKProcessPoolManager.swift
@@ -1,6 +1,6 @@
 //
 //  WKProcessPoolManager.swift
-//  flutter_inappbrowser
+//  flutter_inappwebview
 //
 //  Created by Lorenzo Pichilli on 19/11/2019.
 //
diff --git a/ios/Storyboards/WebView.storyboard b/ios/Storyboards/WebView.storyboard
index 65e18bfb..512edab9 100755
--- a/ios/Storyboards/WebView.storyboard
+++ b/ios/Storyboards/WebView.storyboard
@@ -12,7 +12,7 @@
         <!--In App Browser Web View Controller-->
         <scene sceneID="PeV-E5-ivI">
             <objects>
-                <viewController storyboardIdentifier="viewController" id="zfm-Ja-gep" customClass="InAppBrowserWebViewController" customModule="flutter_inappbrowser" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="viewController" id="zfm-Ja-gep" customClass="InAppBrowserWebViewController" customModule="flutter_inappwebview" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="eCU-xC-qdo"/>
                         <viewControllerLayoutGuide type="bottom" id="dUM-I7-PRF"/>
@@ -21,7 +21,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gA9-n8-qaQ" userLabel="Container WebView" customClass="InAppWebView_IBWrapper" customModule="flutter_inappbrowser">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gA9-n8-qaQ" userLabel="Container WebView" customClass="InAppWebView_IBWrapper" customModule="flutter_inappwebview">
                                 <rect key="frame" x="0.0" y="66" width="414" height="626"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
diff --git a/ios/flutter_inappbrowser.podspec b/ios/flutter_inappwebview.podspec
similarity index 94%
rename from ios/flutter_inappbrowser.podspec
rename to ios/flutter_inappwebview.podspec
index b106de5b..ce183555 100755
--- a/ios/flutter_inappbrowser.podspec
+++ b/ios/flutter_inappwebview.podspec
@@ -2,7 +2,7 @@
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
 #
 Pod::Spec.new do |s|
-  s.name             = 'flutter_inappbrowser'
+  s.name             = 'flutter_inappwebview'
   s.version          = '0.0.1'
   s.summary          = 'A new Flutter plugin.'
   s.description      = <<-DESC
diff --git a/lib/flutter_inappbrowser.dart b/lib/flutter_inappwebview.dart
similarity index 97%
rename from lib/flutter_inappbrowser.dart
rename to lib/flutter_inappwebview.dart
index 0a85ddc1..11846217 100644
--- a/lib/flutter_inappbrowser.dart
+++ b/lib/flutter_inappwebview.dart
@@ -19,7 +19,7 @@
  *
 */
 
-library flutter_inappbrowser;
+library flutter_inappwebview;
 
 export 'src/types.dart';
 export 'src/in_app_webview.dart';
diff --git a/lib/src/cookie_manager.dart b/lib/src/cookie_manager.dart
index 16f64148..31b17ced 100644
--- a/lib/src/cookie_manager.dart
+++ b/lib/src/cookie_manager.dart
@@ -10,7 +10,7 @@ import 'types.dart';
 ///**NOTE for iOS**: available from iOS 11.0+.
 class CookieManager {
   static CookieManager _instance;
-  static const MethodChannel _channel = const MethodChannel('com.pichillilorenzo/flutter_inappbrowser_cookiemanager');
+  static const MethodChannel _channel = const MethodChannel('com.pichillilorenzo/flutter_inappwebview_cookiemanager');
 
   ///Gets the cookie manager shared instance.
   static CookieManager instance() {
diff --git a/lib/src/http_auth_credentials_database.dart b/lib/src/http_auth_credentials_database.dart
index 331ef916..f54e3e8f 100644
--- a/lib/src/http_auth_credentials_database.dart
+++ b/lib/src/http_auth_credentials_database.dart
@@ -11,7 +11,7 @@ import 'package:flutter/services.dart';
 ///doesn't offer the same functionalities as iOS `URLCredentialStorage`.
 class HttpAuthCredentialDatabase {
   static HttpAuthCredentialDatabase _instance;
-  static const MethodChannel _channel = const MethodChannel('com.pichillilorenzo/flutter_inappbrowser_credential_database');
+  static const MethodChannel _channel = const MethodChannel('com.pichillilorenzo/flutter_inappwebview_credential_database');
 
   ///Gets the database shared instance.
   static HttpAuthCredentialDatabase instance() {
diff --git a/lib/src/in_app_browser.dart b/lib/src/in_app_browser.dart
index c5cda046..68c8bfc9 100644
--- a/lib/src/in_app_browser.dart
+++ b/lib/src/in_app_browser.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_inappbrowser/src/webview_options.dart';
+import 'webview_options.dart';
 
 import 'types.dart';
 import 'channel_manager.dart';
diff --git a/lib/src/in_app_webview.dart b/lib/src/in_app_webview.dart
index c299abf4..24fea93b 100755
--- a/lib/src/in_app_webview.dart
+++ b/lib/src/in_app_webview.dart
@@ -167,7 +167,7 @@ class InAppWebView extends StatefulWidget {
   ///Also, unlike iOS that has [WKUserScript](https://developer.apple.com/documentation/webkit/wkuserscript) that
   ///can inject javascript code right after the document element is created but before any other content is loaded, in Android the javascript code
   ///used to intercept ajax requests is loaded as soon as possible so it won't be instantaneous as iOS but just after some milliseconds (< ~100ms).
-  ///Inside the `window.addEventListener("flutterInAppBrowserPlatformReady")` event, the ajax requests will be intercept for sure.
+  ///Inside the `window.addEventListener("flutterInAppWebViewPlatformReady")` event, the ajax requests will be intercept for sure.
   final Future<AjaxRequest> Function(InAppWebViewController controller, AjaxRequest ajaxRequest) shouldInterceptAjaxRequest;
 
   ///Event fired whenever the `readyState` attribute of an `XMLHttpRequest` changes.
@@ -179,7 +179,7 @@ class InAppWebView extends StatefulWidget {
   ///Also, unlike iOS that has [WKUserScript](https://developer.apple.com/documentation/webkit/wkuserscript) that
   ///can inject javascript code right after the document element is created but before any other content is loaded, in Android the javascript code
   ///used to intercept ajax requests is loaded as soon as possible so it won't be instantaneous as iOS but just after some milliseconds (< ~100ms).
-  ///Inside the `window.addEventListener("flutterInAppBrowserPlatformReady")` event, the ajax requests will be intercept for sure.
+  ///Inside the `window.addEventListener("flutterInAppWebViewPlatformReady")` event, the ajax requests will be intercept for sure.
   final Future<AjaxRequestAction> Function(InAppWebViewController controller, AjaxRequest ajaxRequest) onAjaxReadyStateChange;
 
   ///Event fired as an `XMLHttpRequest` progress.
@@ -191,7 +191,7 @@ class InAppWebView extends StatefulWidget {
   ///Also, unlike iOS that has [WKUserScript](https://developer.apple.com/documentation/webkit/wkuserscript) that
   ///can inject javascript code right after the document element is created but before any other content is loaded, in Android the javascript code
   ///used to intercept ajax requests is loaded as soon as possible so it won't be instantaneous as iOS but just after some milliseconds (< ~100ms).
-  ///Inside the `window.addEventListener("flutterInAppBrowserPlatformReady")` event, the ajax requests will be intercept for sure.
+  ///Inside the `window.addEventListener("flutterInAppWebViewPlatformReady")` event, the ajax requests will be intercept for sure.
   final Future<AjaxRequestAction> Function(InAppWebViewController controller, AjaxRequest ajaxRequest) onAjaxProgress;
 
   ///Event fired when a request is sent to a server through [Fetch API](https://developer.mozilla.org/it/docs/Web/API/Fetch_API).
@@ -203,7 +203,7 @@ class InAppWebView extends StatefulWidget {
   ///Also, unlike iOS that has [WKUserScript](https://developer.apple.com/documentation/webkit/wkuserscript) that
   ///can inject javascript code right after the document element is created but before any other content is loaded, in Android the javascript code
   ///used to intercept fetch requests is loaded as soon as possible so it won't be instantaneous as iOS but just after some milliseconds (< ~100ms).
-  ///Inside the `window.addEventListener("flutterInAppBrowserPlatformReady")` event, the fetch requests will be intercept for sure.
+  ///Inside the `window.addEventListener("flutterInAppWebViewPlatformReady")` event, the fetch requests will be intercept for sure.
   final Future<FetchRequest> Function(InAppWebViewController controller, FetchRequest fetchRequest) shouldInterceptFetchRequest;
 
   ///Event fired when the navigation state of the [InAppWebView] changes throught the usage of
@@ -347,7 +347,7 @@ class _InAppWebViewState extends State<InAppWebView> {
       );
     }
     return Text(
-        '$defaultTargetPlatform is not yet supported by the flutter_inappbrowser plugin');
+        '$defaultTargetPlatform is not yet supported by the flutter_inappwebview plugin');
   }
 
   @override
@@ -1162,30 +1162,30 @@ class InAppWebViewController {
   ///The Android implementation uses [addJavascriptInterface](https://developer.android.com/reference/android/webkit/WebView#addJavascriptInterface(java.lang.Object,%20java.lang.String)).
   ///The iOS implementation uses [addScriptMessageHandler](https://developer.apple.com/documentation/webkit/wkusercontentcontroller/1537172-addscriptmessagehandler?language=objc)
   ///
-  ///The JavaScript function that can be used to call the handler is `window.flutter_inappbrowser.callHandler(handlerName <String>, ...args)`, where `args` are [rest parameters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters).
+  ///The JavaScript function that can be used to call the handler is `window.flutter_inappwebview.callHandler(handlerName <String>, ...args)`, where `args` are [rest parameters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters).
   ///The `args` will be stringified automatically using `JSON.stringify(args)` method and then they will be decoded on the Dart side.
   ///
-  ///In order to call `window.flutter_inappbrowser.callHandler(handlerName <String>, ...args)` properly, you need to wait and listen the JavaScript event `flutterInAppBrowserPlatformReady`.
+  ///In order to call `window.flutter_inappwebview.callHandler(handlerName <String>, ...args)` properly, you need to wait and listen the JavaScript event `flutterInAppWebViewPlatformReady`.
   ///This event will be dispatched as soon as the platform (Android or iOS) is ready to handle the `callHandler` method.
   ///```javascript
-  ///   window.addEventListener("flutterInAppBrowserPlatformReady", function(event) {
+  ///   window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
   ///     console.log("ready");
   ///   });
   ///```
   ///
-  ///`window.flutter_inappbrowser.callHandler` returns a JavaScript [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
+  ///`window.flutter_inappwebview.callHandler` returns a JavaScript [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
   ///that can be used to get the json result returned by [JavaScriptHandlerCallback].
   ///In this case, simply return data that you want to send and it will be automatically json encoded using [jsonEncode] from the `dart:convert` library.
   ///
   ///So, on the JavaScript side, to get data coming from the Dart side, you will use:
   ///```html
   ///<script>
-  ///   window.addEventListener("flutterInAppBrowserPlatformReady", function(event) {
-  ///     window.flutter_inappbrowser.callHandler('handlerFoo').then(function(result) {
+  ///   window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
+  ///     window.flutter_inappwebview.callHandler('handlerFoo').then(function(result) {
   ///       console.log(result);
   ///     });
   ///
-  ///     window.flutter_inappbrowser.callHandler('handlerFooWithArgs', 1, true, ['bar', 5], {foo: 'baz'}).then(function(result) {
+  ///     window.flutter_inappwebview.callHandler('handlerFooWithArgs', 1, true, ['bar', 5], {foo: 'baz'}).then(function(result) {
   ///       console.log(result);
   ///     });
   ///   });
@@ -1196,7 +1196,7 @@ class InAppWebViewController {
   ///```dart
   ///  // Inject JavaScript that will receive data back from Flutter
   ///  inAppWebViewController.evaluateJavascript(source: """
-  ///    window.flutter_inappbrowser.callHandler('test', 'Text from Javascript').then(function(result) {
+  ///    window.flutter_inappwebview.callHandler('test', 'Text from Javascript').then(function(result) {
   ///      console.log(result);
   ///    });
   ///  """);
@@ -1434,12 +1434,12 @@ class InAppWebViewController {
 
   ///Gets the html (with javascript) of the Chromium's t-rex runner game. Used in combination with [getTRexRunnerCss()].
   Future<String> getTRexRunnerHtml() async {
-    return await rootBundle.loadString("packages/flutter_inappbrowser/t_rex_runner/t-rex.html");
+    return await rootBundle.loadString("packages/flutter_inappwebview/t_rex_runner/t-rex.html");
   }
 
   ///Gets the css of the Chromium's t-rex runner game. Used in combination with [getTRexRunnerHtml()].
   Future<String> getTRexRunnerCss() async {
-    return await rootBundle.loadString("packages/flutter_inappbrowser/t_rex_runner/t-rex.css");
+    return await rootBundle.loadString("packages/flutter_inappwebview/t_rex_runner/t-rex.css");
   }
 
   ///Scrolls the WebView to the position.
diff --git a/lib/src/types.dart b/lib/src/types.dart
index 240cb032..cbaaa750 100644
--- a/lib/src/types.dart
+++ b/lib/src/types.dart
@@ -16,7 +16,7 @@ typedef Future<dynamic> ListenerCallback(MethodCall call);
 ///The Android implementation uses [addJavascriptInterface](https://developer.android.com/reference/android/webkit/WebView#addJavascriptInterface(java.lang.Object,%20java.lang.String)).
 ///The iOS implementation uses [addScriptMessageHandler](https://developer.apple.com/documentation/webkit/wkusercontentcontroller/1537172-addscriptmessagehandler?language=objc)
 ///
-///The JavaScript function that can be used to call the handler is `window.flutter_inappbrowser.callHandler(handlerName <String>, ...args);`, where `args` are [rest parameters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters).
+///The JavaScript function that can be used to call the handler is `window.flutter_inappwebview.callHandler(handlerName <String>, ...args);`, where `args` are [rest parameters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters).
 ///The `args` will be stringified automatically using `JSON.stringify(args)` method and then they will be decoded on the Dart side.
 ///
 ///Also, a [JavaScriptHandlerCallback] can return json data to the JavaScript side.
diff --git a/lib/src/webview_options.dart b/lib/src/webview_options.dart
index f4d0c972..daffcafd 100644
--- a/lib/src/webview_options.dart
+++ b/lib/src/webview_options.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
+import 'content_blocker.dart';
 import 'types.dart';
-import 'package:flutter_inappbrowser/src/content_blocker.dart';
 
 class AndroidOptions {}
 class IosOptions {}
diff --git a/pubspec.yaml b/pubspec.yaml
index eda78150..f3d67995 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,8 +1,8 @@
-name: flutter_inappbrowser
+name: flutter_inappwebview
 description: A Flutter plugin that allows you to add an inline webview or open an in-app browser window.
 version: 2.0.1
 author: Lorenzo Pichilli <pichillilorenzo@gmail.com>
-homepage: https://github.com/pichillilorenzo/flutter_inappbrowser
+homepage: https://github.com/pichillilorenzo/flutter_inappwebview
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"
@@ -21,12 +21,12 @@ dependencies:
 # The following section is specific to Flutter.
 flutter:
   plugin:
-    androidPackage: com.pichillilorenzo.flutter_inappbrowser
-    pluginClass: InAppBrowserFlutterPlugin
+    androidPackage: com.pichillilorenzo.flutter_inappwebview
+    pluginClass: InAppWebViewFlutterPlugin
 
   assets:
-    - packages/flutter_inappbrowser/t_rex_runner/t-rex.html
-    - packages/flutter_inappbrowser/t_rex_runner/t-rex.css
+    - packages/flutter_inappwebview/t_rex_runner/t-rex.html
+    - packages/flutter_inappwebview/t_rex_runner/t-rex.css
   # To add assets to your plugin package, add an assets section, like this:
   # assets:
   #  - images/a_dot_burr.jpeg