diff --git a/rxlifecycle-android-lifecycle-kotlin/src/main/java/com/trello/rxlifecycle2/android/lifecycle/kotlin/rxlifecycle.kt b/rxlifecycle-android-lifecycle-kotlin/src/main/java/com/trello/rxlifecycle3/android/lifecycle/kotlin/rxlifecycle.kt
similarity index 97%
rename from rxlifecycle-android-lifecycle-kotlin/src/main/java/com/trello/rxlifecycle2/android/lifecycle/kotlin/rxlifecycle.kt
rename to rxlifecycle-android-lifecycle-kotlin/src/main/java/com/trello/rxlifecycle3/android/lifecycle/kotlin/rxlifecycle.kt
index ad48eaa..933acd3 100644
--- a/rxlifecycle-android-lifecycle-kotlin/src/main/java/com/trello/rxlifecycle2/android/lifecycle/kotlin/rxlifecycle.kt
+++ b/rxlifecycle-android-lifecycle-kotlin/src/main/java/com/trello/rxlifecycle3/android/lifecycle/kotlin/rxlifecycle.kt
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.android.lifecycle.kotlin
+package com.trello.rxlifecycle3.android.lifecycle.kotlin
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
diff --git a/rxlifecycle-android-lifecycle/src/main/AndroidManifest.xml b/rxlifecycle-android-lifecycle/src/main/AndroidManifest.xml
index c7cb861..89009d8 100644
--- a/rxlifecycle-android-lifecycle/src/main/AndroidManifest.xml
+++ b/rxlifecycle-android-lifecycle/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
-<manifest package="com.trello.rxlifecycle2.android.lifecycle" />
+<manifest package="com.trello.rxlifecycle3.android.lifecycle" />
 
diff --git a/rxlifecycle-android-lifecycle/src/main/java/com/trello/lifecycle2/android/lifecycle/AndroidLifecycle.java b/rxlifecycle-android-lifecycle/src/main/java/com/trello/lifecycle2/android/lifecycle/AndroidLifecycle.java
index ca37c76..ee7caf1 100644
--- a/rxlifecycle-android-lifecycle/src/main/java/com/trello/lifecycle2/android/lifecycle/AndroidLifecycle.java
+++ b/rxlifecycle-android-lifecycle/src/main/java/com/trello/lifecycle2/android/lifecycle/AndroidLifecycle.java
@@ -1,8 +1,8 @@
 package com.trello.lifecycle2.android.lifecycle;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
 
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
diff --git a/rxlifecycle-android-lifecycle/src/main/java/com/trello/lifecycle2/android/lifecycle/RxLifecycleAndroidLifecycle.java b/rxlifecycle-android-lifecycle/src/main/java/com/trello/lifecycle2/android/lifecycle/RxLifecycleAndroidLifecycle.java
index 4951536..ecb1860 100644
--- a/rxlifecycle-android-lifecycle/src/main/java/com/trello/lifecycle2/android/lifecycle/RxLifecycleAndroidLifecycle.java
+++ b/rxlifecycle-android-lifecycle/src/main/java/com/trello/lifecycle2/android/lifecycle/RxLifecycleAndroidLifecycle.java
@@ -1,7 +1,7 @@
 package com.trello.lifecycle2.android.lifecycle;
 
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.OutsideLifecycleException;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.OutsideLifecycleException;
 
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
@@ -9,7 +9,7 @@
 import io.reactivex.Observable;
 import io.reactivex.functions.Function;
 
-import static com.trello.rxlifecycle2.RxLifecycle.bind;
+import static com.trello.rxlifecycle3.RxLifecycle.bind;
 
 public final class RxLifecycleAndroidLifecycle {
 
diff --git a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/RxLifecycleTest.java b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
similarity index 99%
rename from rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/RxLifecycleTest.java
rename to rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
index 64fb059..8435452 100644
--- a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/RxLifecycleTest.java
+++ b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
@@ -1,4 +1,4 @@
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import com.trello.lifecycle2.android.lifecycle.RxLifecycleAndroidLifecycle;
 
diff --git a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleActivityTest.java b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/android/lifecycle/AndroidLifecycleActivityTest.java
similarity index 97%
rename from rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleActivityTest.java
rename to rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/android/lifecycle/AndroidLifecycleActivityTest.java
index 8025ddc..c773d3e 100644
--- a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleActivityTest.java
+++ b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/android/lifecycle/AndroidLifecycleActivityTest.java
@@ -1,7 +1,7 @@
-package com.trello.rxlifecycle2.android.lifecycle;
+package com.trello.rxlifecycle3.android.lifecycle;
 
 import com.trello.lifecycle2.android.lifecycle.AndroidLifecycle;
-import com.trello.rxlifecycle2.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleProvider;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleFragmentTest.java b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/android/lifecycle/AndroidLifecycleFragmentTest.java
similarity index 97%
rename from rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleFragmentTest.java
rename to rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/android/lifecycle/AndroidLifecycleFragmentTest.java
index a507a0a..3c8c03e 100644
--- a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleFragmentTest.java
+++ b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/android/lifecycle/AndroidLifecycleFragmentTest.java
@@ -1,7 +1,7 @@
-package com.trello.rxlifecycle2.android.lifecycle;
+package com.trello.rxlifecycle3.android.lifecycle;
 
 import com.trello.lifecycle2.android.lifecycle.AndroidLifecycle;
-import com.trello.rxlifecycle2.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleProvider;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle-android/src/main/AndroidManifest.xml b/rxlifecycle-android/src/main/AndroidManifest.xml
index a6aeed3..200a53a 100644
--- a/rxlifecycle-android/src/main/AndroidManifest.xml
+++ b/rxlifecycle-android/src/main/AndroidManifest.xml
@@ -10,4 +10,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<manifest package="com.trello.rxlifecycle2.android" />
\ No newline at end of file
+<manifest package="com.trello.rxlifecycle3.android" />
\ No newline at end of file
diff --git a/rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/ActivityEvent.java b/rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/ActivityEvent.java
similarity index 94%
rename from rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/ActivityEvent.java
rename to rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/ActivityEvent.java
index 9736655..2a4073e 100644
--- a/rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/ActivityEvent.java
+++ b/rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/ActivityEvent.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.android;
+package com.trello.rxlifecycle3.android;
 
 /**
  * Lifecycle events that can be emitted by Activities.
diff --git a/rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/FragmentEvent.java b/rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/FragmentEvent.java
similarity index 95%
rename from rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/FragmentEvent.java
rename to rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/FragmentEvent.java
index 9ceae52..fbae4cf 100644
--- a/rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/FragmentEvent.java
+++ b/rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/FragmentEvent.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.android;
+package com.trello.rxlifecycle3.android;
 
 /**
  * Lifecycle events that can be emitted by Fragments.
diff --git a/rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/RxLifecycleAndroid.java b/rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/RxLifecycleAndroid.java
similarity index 95%
rename from rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/RxLifecycleAndroid.java
rename to rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/RxLifecycleAndroid.java
index 71a0ed9..f5fca38 100644
--- a/rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/RxLifecycleAndroid.java
+++ b/rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/RxLifecycleAndroid.java
@@ -12,20 +12,20 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.android;
+package com.trello.rxlifecycle3.android;
 
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.OutsideLifecycleException;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.OutsideLifecycleException;
 
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 import io.reactivex.Observable;
 import io.reactivex.functions.Function;
 
-import static com.trello.rxlifecycle2.RxLifecycle.bind;
-import static com.trello.rxlifecycle2.internal.Preconditions.checkNotNull;
+import static com.trello.rxlifecycle3.RxLifecycle.bind;
+import static com.trello.rxlifecycle3.internal.Preconditions.checkNotNull;
 
 public class RxLifecycleAndroid {
 
diff --git a/rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/ViewDetachesOnSubscribe.java b/rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/ViewDetachesOnSubscribe.java
similarity index 97%
rename from rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/ViewDetachesOnSubscribe.java
rename to rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/ViewDetachesOnSubscribe.java
index 6275dcb..7767076 100644
--- a/rxlifecycle-android/src/main/java/com/trello/rxlifecycle2/android/ViewDetachesOnSubscribe.java
+++ b/rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/ViewDetachesOnSubscribe.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.android;
+package com.trello.rxlifecycle3.android;
 
 import android.view.View;
 
diff --git a/rxlifecycle-android/src/test/java/com/trello/rxlifecycle2/RxLifecycleTest.java b/rxlifecycle-android/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
similarity index 98%
rename from rxlifecycle-android/src/test/java/com/trello/rxlifecycle2/RxLifecycleTest.java
rename to rxlifecycle-android/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
index 2484273..af59133 100644
--- a/rxlifecycle-android/src/test/java/com/trello/rxlifecycle2/RxLifecycleTest.java
+++ b/rxlifecycle-android/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import android.app.Activity;
 import android.view.View;
 
-import com.trello.rxlifecycle2.android.ActivityEvent;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle-android/src/test/java/com/trello/rxlifecycle2/TestUtil.java b/rxlifecycle-android/src/test/java/com/trello/rxlifecycle3/TestUtil.java
similarity index 97%
rename from rxlifecycle-android/src/test/java/com/trello/rxlifecycle2/TestUtil.java
rename to rxlifecycle-android/src/test/java/com/trello/rxlifecycle3/TestUtil.java
index 24afdba..b03b729 100644
--- a/rxlifecycle-android/src/test/java/com/trello/rxlifecycle2/TestUtil.java
+++ b/rxlifecycle-android/src/test/java/com/trello/rxlifecycle3/TestUtil.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import android.view.View;
 
diff --git a/rxlifecycle-components-preference/src/main/AndroidManifest.xml b/rxlifecycle-components-preference/src/main/AndroidManifest.xml
index 6815889..a5d0ab0 100644
--- a/rxlifecycle-components-preference/src/main/AndroidManifest.xml
+++ b/rxlifecycle-components-preference/src/main/AndroidManifest.xml
@@ -10,4 +10,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<manifest package="com.trello.rxlifecycle2.components.preference" />
\ No newline at end of file
+<manifest package="com.trello.rxlifecycle3.components.preference" />
\ No newline at end of file
diff --git a/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxEditTextPreferenceDialogFragmentCompat.java b/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxEditTextPreferenceDialogFragmentCompat.java
similarity index 91%
rename from rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxEditTextPreferenceDialogFragmentCompat.java
rename to rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxEditTextPreferenceDialogFragmentCompat.java
index d9af71c..2a79876 100644
--- a/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxEditTextPreferenceDialogFragmentCompat.java
+++ b/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxEditTextPreferenceDialogFragmentCompat.java
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.preference;
+package com.trello.rxlifecycle3.components.preference;
 
 import android.os.Bundle;
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxListPreferenceDialogFragmentCompat.java b/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxListPreferenceDialogFragmentCompat.java
similarity index 91%
rename from rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxListPreferenceDialogFragmentCompat.java
rename to rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxListPreferenceDialogFragmentCompat.java
index 8f6055b..c5ff518 100644
--- a/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxListPreferenceDialogFragmentCompat.java
+++ b/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxListPreferenceDialogFragmentCompat.java
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.preference;
+package com.trello.rxlifecycle3.components.preference;
 
 import android.os.Bundle;
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxPreferenceDialogFragmentCompat.java b/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxPreferenceDialogFragmentCompat.java
similarity index 91%
rename from rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxPreferenceDialogFragmentCompat.java
rename to rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxPreferenceDialogFragmentCompat.java
index 1c3c277..47565d9 100644
--- a/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxPreferenceDialogFragmentCompat.java
+++ b/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxPreferenceDialogFragmentCompat.java
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.preference;
+package com.trello.rxlifecycle3.components.preference;
 
 import android.os.Bundle;
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxPreferenceFragmentCompat.java b/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxPreferenceFragmentCompat.java
similarity index 91%
rename from rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxPreferenceFragmentCompat.java
rename to rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxPreferenceFragmentCompat.java
index 28dc348..9d3585e 100644
--- a/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle2/components/preference/RxPreferenceFragmentCompat.java
+++ b/rxlifecycle-components-preference/src/main/java/com/trello/rxlifecycle3/components/preference/RxPreferenceFragmentCompat.java
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.preference;
+package com.trello.rxlifecycle3.components.preference;
 
 import android.os.Bundle;
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components-preference/src/test/java/com/trello/rxlifecycle2/components/preference/RxPreferenceFragmentLifecycleTest.java b/rxlifecycle-components-preference/src/test/java/com/trello/rxlifecycle3/components/preference/RxPreferenceFragmentLifecycleTest.java
similarity index 96%
rename from rxlifecycle-components-preference/src/test/java/com/trello/rxlifecycle2/components/preference/RxPreferenceFragmentLifecycleTest.java
rename to rxlifecycle-components-preference/src/test/java/com/trello/rxlifecycle3/components/preference/RxPreferenceFragmentLifecycleTest.java
index b722462..61b29be 100644
--- a/rxlifecycle-components-preference/src/test/java/com/trello/rxlifecycle2/components/preference/RxPreferenceFragmentLifecycleTest.java
+++ b/rxlifecycle-components-preference/src/test/java/com/trello/rxlifecycle3/components/preference/RxPreferenceFragmentLifecycleTest.java
@@ -12,12 +12,12 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.preference;
+package com.trello.rxlifecycle3.components.preference;
 
 import android.os.Bundle;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.android.FragmentEvent;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.android.FragmentEvent;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -32,7 +32,7 @@
 import io.reactivex.observers.TestObserver;
 import io.reactivex.subjects.PublishSubject;
 
-import static com.trello.rxlifecycle2.android.FragmentEvent.STOP;
+import static com.trello.rxlifecycle3.android.FragmentEvent.STOP;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
diff --git a/rxlifecycle-components/src/main/AndroidManifest.xml b/rxlifecycle-components/src/main/AndroidManifest.xml
index d9c58c7..3636cee 100644
--- a/rxlifecycle-components/src/main/AndroidManifest.xml
+++ b/rxlifecycle-components/src/main/AndroidManifest.xml
@@ -10,4 +10,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<manifest package="com.trello.rxlifecycle2.components" />
\ No newline at end of file
+<manifest package="com.trello.rxlifecycle3.components" />
\ No newline at end of file
diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxActivity.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxActivity.java
similarity index 89%
rename from rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxActivity.java
rename to rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxActivity.java
index 4ddcb6f..a6f67ce 100644
--- a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxActivity.java
+++ b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxActivity.java
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components;
+package com.trello.rxlifecycle3.components;
 
 import android.app.Activity;
 import android.os.Bundle;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.ActivityEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxDialogFragment.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxDialogFragment.java
similarity index 91%
rename from rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxDialogFragment.java
rename to rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxDialogFragment.java
index 809faf1..e027a8b 100644
--- a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxDialogFragment.java
+++ b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxDialogFragment.java
@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components;
+package com.trello.rxlifecycle3.components;
 
 import android.app.DialogFragment;
 import android.os.Bundle;
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxFragment.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxFragment.java
similarity index 91%
rename from rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxFragment.java
rename to rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxFragment.java
index 9921ee0..c255828 100644
--- a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxFragment.java
+++ b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxFragment.java
@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components;
+package com.trello.rxlifecycle3.components;
 
 import android.app.Fragment;
 import android.os.Bundle;
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxPreferenceFragment.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxPreferenceFragment.java
similarity index 91%
rename from rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxPreferenceFragment.java
rename to rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxPreferenceFragment.java
index f4664cb..b4dd6a7 100644
--- a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/RxPreferenceFragment.java
+++ b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxPreferenceFragment.java
@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components;
+package com.trello.rxlifecycle3.components;
 
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxAppCompatActivity.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxAppCompatActivity.java
similarity index 89%
rename from rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxAppCompatActivity.java
rename to rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxAppCompatActivity.java
index a3c9aba..3b02e16 100644
--- a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxAppCompatActivity.java
+++ b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxAppCompatActivity.java
@@ -12,15 +12,15 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.support;
+package com.trello.rxlifecycle3.components.support;
 
 import android.os.Bundle;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.ActivityEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxAppCompatDialogFragment.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxAppCompatDialogFragment.java
similarity index 91%
rename from rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxAppCompatDialogFragment.java
rename to rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxAppCompatDialogFragment.java
index 27bfb41..0971078 100644
--- a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxAppCompatDialogFragment.java
+++ b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxAppCompatDialogFragment.java
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.support;
+package com.trello.rxlifecycle3.components.support;
 
 import android.os.Bundle;
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxDialogFragment.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxDialogFragment.java
similarity index 91%
rename from rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxDialogFragment.java
rename to rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxDialogFragment.java
index f5955f9..2011cc8 100644
--- a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxDialogFragment.java
+++ b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxDialogFragment.java
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.support;
+package com.trello.rxlifecycle3.components.support;
 
 import android.os.Bundle;
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxFragment.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxFragment.java
similarity index 90%
rename from rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxFragment.java
rename to rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxFragment.java
index d5a07e2..27f8790 100644
--- a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxFragment.java
+++ b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxFragment.java
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.support;
+package com.trello.rxlifecycle3.components.support;
 
 import android.os.Bundle;
 import android.view.View;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxFragmentActivity.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxFragmentActivity.java
similarity index 89%
rename from rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxFragmentActivity.java
rename to rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxFragmentActivity.java
index bf90aa1..895f58d 100644
--- a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle2/components/support/RxFragmentActivity.java
+++ b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxFragmentActivity.java
@@ -12,15 +12,15 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.support;
+package com.trello.rxlifecycle3.components.support;
 
 import android.os.Bundle;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.ActivityEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
diff --git a/rxlifecycle-components/src/test/java/com/trello/rxlifecycle2/components/RxActivityLifecycleTest.java b/rxlifecycle-components/src/test/java/com/trello/rxlifecycle3/components/RxActivityLifecycleTest.java
similarity index 94%
rename from rxlifecycle-components/src/test/java/com/trello/rxlifecycle2/components/RxActivityLifecycleTest.java
rename to rxlifecycle-components/src/test/java/com/trello/rxlifecycle3/components/RxActivityLifecycleTest.java
index fbe660f..48dcaac 100644
--- a/rxlifecycle-components/src/test/java/com/trello/rxlifecycle2/components/RxActivityLifecycleTest.java
+++ b/rxlifecycle-components/src/test/java/com/trello/rxlifecycle3/components/RxActivityLifecycleTest.java
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components;
+package com.trello.rxlifecycle3.components;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.android.ActivityEvent;
-import com.trello.rxlifecycle2.components.support.RxFragmentActivity;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.trello.rxlifecycle3.components.support.RxFragmentActivity;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,7 +30,7 @@
 import io.reactivex.observers.TestObserver;
 import io.reactivex.subjects.PublishSubject;
 
-import static com.trello.rxlifecycle2.android.ActivityEvent.STOP;
+import static com.trello.rxlifecycle3.android.ActivityEvent.STOP;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
diff --git a/rxlifecycle-components/src/test/java/com/trello/rxlifecycle2/components/RxFragmentLifecycleTest.java b/rxlifecycle-components/src/test/java/com/trello/rxlifecycle3/components/RxFragmentLifecycleTest.java
similarity index 96%
rename from rxlifecycle-components/src/test/java/com/trello/rxlifecycle2/components/RxFragmentLifecycleTest.java
rename to rxlifecycle-components/src/test/java/com/trello/rxlifecycle3/components/RxFragmentLifecycleTest.java
index 51cc9f0..ce600f9 100644
--- a/rxlifecycle-components/src/test/java/com/trello/rxlifecycle2/components/RxFragmentLifecycleTest.java
+++ b/rxlifecycle-components/src/test/java/com/trello/rxlifecycle3/components/RxFragmentLifecycleTest.java
@@ -12,12 +12,12 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components;
+package com.trello.rxlifecycle3.components;
 
 import android.app.Fragment;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.android.FragmentEvent;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.android.FragmentEvent;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,7 +30,7 @@
 import io.reactivex.observers.TestObserver;
 import io.reactivex.subjects.PublishSubject;
 
-import static com.trello.rxlifecycle2.android.FragmentEvent.STOP;
+import static com.trello.rxlifecycle3.android.FragmentEvent.STOP;
 import static org.robolectric.util.FragmentTestUtil.startFragment;
 
 @RunWith(RobolectricTestRunner.class)
diff --git a/rxlifecycle-components/src/test/java/com/trello/rxlifecycle2/components/support/RxSupportFragmentLifecycleTest.java b/rxlifecycle-components/src/test/java/com/trello/rxlifecycle3/components/support/RxSupportFragmentLifecycleTest.java
similarity index 97%
rename from rxlifecycle-components/src/test/java/com/trello/rxlifecycle2/components/support/RxSupportFragmentLifecycleTest.java
rename to rxlifecycle-components/src/test/java/com/trello/rxlifecycle3/components/support/RxSupportFragmentLifecycleTest.java
index 564ecf9..1f084ee 100644
--- a/rxlifecycle-components/src/test/java/com/trello/rxlifecycle2/components/support/RxSupportFragmentLifecycleTest.java
+++ b/rxlifecycle-components/src/test/java/com/trello/rxlifecycle3/components/support/RxSupportFragmentLifecycleTest.java
@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components.support;
+package com.trello.rxlifecycle3.components.support;
 
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.android.FragmentEvent;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.android.FragmentEvent;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,7 +30,7 @@
 import io.reactivex.observers.TestObserver;
 import io.reactivex.subjects.PublishSubject;
 
-import static com.trello.rxlifecycle2.android.FragmentEvent.STOP;
+import static com.trello.rxlifecycle3.android.FragmentEvent.STOP;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
diff --git a/rxlifecycle-kotlin/src/main/AndroidManifest.xml b/rxlifecycle-kotlin/src/main/AndroidManifest.xml
index b00f4ae..c216934 100644
--- a/rxlifecycle-kotlin/src/main/AndroidManifest.xml
+++ b/rxlifecycle-kotlin/src/main/AndroidManifest.xml
@@ -10,4 +10,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<manifest package="com.trello.rxlifecycle2.kotlin" />
\ No newline at end of file
+<manifest package="com.trello.rxlifecycle3.kotlin" />
\ No newline at end of file
diff --git a/rxlifecycle-kotlin/src/main/java/com/trello/rxlifecycle2/kotlin/rxlifecycle.kt b/rxlifecycle-kotlin/src/main/java/com/trello/rxlifecycle3/kotlin/rxlifecycle.kt
similarity index 96%
rename from rxlifecycle-kotlin/src/main/java/com/trello/rxlifecycle2/kotlin/rxlifecycle.kt
rename to rxlifecycle-kotlin/src/main/java/com/trello/rxlifecycle3/kotlin/rxlifecycle.kt
index 65d25a2..8c7fc3e 100644
--- a/rxlifecycle-kotlin/src/main/java/com/trello/rxlifecycle2/kotlin/rxlifecycle.kt
+++ b/rxlifecycle-kotlin/src/main/java/com/trello/rxlifecycle3/kotlin/rxlifecycle.kt
@@ -12,12 +12,12 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.kotlin
+package com.trello.rxlifecycle3.kotlin
 
 import android.view.View
-import com.trello.rxlifecycle2.LifecycleProvider
-import com.trello.rxlifecycle2.RxLifecycle
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid
+import com.trello.rxlifecycle3.LifecycleProvider
+import com.trello.rxlifecycle3.RxLifecycle
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid
 import io.reactivex.*
 import io.reactivex.functions.Function
 
diff --git a/rxlifecycle-navi/src/main/AndroidManifest.xml b/rxlifecycle-navi/src/main/AndroidManifest.xml
index 22e2981..3a39a6f 100644
--- a/rxlifecycle-navi/src/main/AndroidManifest.xml
+++ b/rxlifecycle-navi/src/main/AndroidManifest.xml
@@ -10,4 +10,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<manifest package="com.trello.rxlifecycle2.navi" />
\ No newline at end of file
+<manifest package="com.trello.rxlifecycle3.navi" />
\ No newline at end of file
diff --git a/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/ActivityLifecycleProviderImpl.java b/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/ActivityLifecycleProviderImpl.java
similarity index 82%
rename from rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/ActivityLifecycleProviderImpl.java
rename to rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/ActivityLifecycleProviderImpl.java
index 59f280b..722e225 100644
--- a/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/ActivityLifecycleProviderImpl.java
+++ b/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/ActivityLifecycleProviderImpl.java
@@ -12,24 +12,24 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.navi;
+package com.trello.rxlifecycle3.navi;
 
 import com.trello.navi2.Event;
 import com.trello.navi2.NaviComponent;
 import com.trello.navi2.rx.RxNavi;
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.ActivityEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 import io.reactivex.Observable;
 import io.reactivex.subjects.BehaviorSubject;
 
-import static com.trello.rxlifecycle2.navi.NaviLifecycleMaps.ACTIVITY_EVENT_FILTER;
-import static com.trello.rxlifecycle2.navi.NaviLifecycleMaps.ACTIVITY_EVENT_MAP;
+import static com.trello.rxlifecycle3.navi.NaviLifecycleMaps.ACTIVITY_EVENT_FILTER;
+import static com.trello.rxlifecycle3.navi.NaviLifecycleMaps.ACTIVITY_EVENT_MAP;
 
 final class ActivityLifecycleProviderImpl implements LifecycleProvider<ActivityEvent> {
     private final BehaviorSubject<ActivityEvent> lifecycleSubject = BehaviorSubject.create();
diff --git a/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/FragmentLifecycleProviderImpl.java b/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/FragmentLifecycleProviderImpl.java
similarity index 83%
rename from rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/FragmentLifecycleProviderImpl.java
rename to rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/FragmentLifecycleProviderImpl.java
index b2e1f35..2687712 100644
--- a/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/FragmentLifecycleProviderImpl.java
+++ b/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/FragmentLifecycleProviderImpl.java
@@ -12,24 +12,24 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.navi;
+package com.trello.rxlifecycle3.navi;
 
 import com.trello.navi2.Event;
 import com.trello.navi2.NaviComponent;
 import com.trello.navi2.rx.RxNavi;
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.LifecycleTransformer;
+import com.trello.rxlifecycle3.RxLifecycle;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 import io.reactivex.Observable;
 import io.reactivex.subjects.BehaviorSubject;
 
-import static com.trello.rxlifecycle2.navi.NaviLifecycleMaps.FRAGMENT_EVENT_FILTER;
-import static com.trello.rxlifecycle2.navi.NaviLifecycleMaps.FRAGMENT_EVENT_MAP;
+import static com.trello.rxlifecycle3.navi.NaviLifecycleMaps.FRAGMENT_EVENT_FILTER;
+import static com.trello.rxlifecycle3.navi.NaviLifecycleMaps.FRAGMENT_EVENT_MAP;
 
 final class FragmentLifecycleProviderImpl implements LifecycleProvider<FragmentEvent> {
     private final BehaviorSubject<FragmentEvent> lifecycleSubject = BehaviorSubject.create();
diff --git a/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/NaviLifecycle.java b/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/NaviLifecycle.java
similarity index 83%
rename from rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/NaviLifecycle.java
rename to rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/NaviLifecycle.java
index 3cc19b8..8fe1a0a 100644
--- a/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/NaviLifecycle.java
+++ b/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/NaviLifecycle.java
@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.navi;
+package com.trello.rxlifecycle3.navi;
 
 import com.trello.navi2.NaviComponent;
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.android.ActivityEvent;
-import com.trello.rxlifecycle2.android.FragmentEvent;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.trello.rxlifecycle3.android.FragmentEvent;
 
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 
-import static com.trello.rxlifecycle2.internal.Preconditions.checkNotNull;
+import static com.trello.rxlifecycle3.internal.Preconditions.checkNotNull;
 
 public final class NaviLifecycle {
 
diff --git a/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/NaviLifecycleMaps.java b/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/NaviLifecycleMaps.java
similarity index 96%
rename from rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/NaviLifecycleMaps.java
rename to rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/NaviLifecycleMaps.java
index 07c87f5..0e8aa08 100644
--- a/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle2/navi/NaviLifecycleMaps.java
+++ b/rxlifecycle-navi/src/main/java/com/trello/rxlifecycle3/navi/NaviLifecycleMaps.java
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.navi;
+package com.trello.rxlifecycle3.navi;
 
 import com.trello.navi2.Event;
-import com.trello.rxlifecycle2.android.ActivityEvent;
-import com.trello.rxlifecycle2.android.FragmentEvent;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.trello.rxlifecycle3.android.FragmentEvent;
 
 import androidx.annotation.NonNull;
 import io.reactivex.functions.Function;
diff --git a/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle2/components/NaviActivityLifecycleTest.java b/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle3/components/NaviActivityLifecycleTest.java
similarity index 95%
rename from rxlifecycle-navi/src/test/java/com/trello/rxlifecycle2/components/NaviActivityLifecycleTest.java
rename to rxlifecycle-navi/src/test/java/com/trello/rxlifecycle3/components/NaviActivityLifecycleTest.java
index e27a108..1501b82 100644
--- a/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle2/components/NaviActivityLifecycleTest.java
+++ b/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle3/components/NaviActivityLifecycleTest.java
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components;
+package com.trello.rxlifecycle3.components;
 
 import android.os.Bundle;
 
 import com.trello.navi2.Event;
 import com.trello.navi2.NaviComponent;
 import com.trello.navi2.internal.NaviEmitter;
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.android.ActivityEvent;
-import com.trello.rxlifecycle2.navi.NaviLifecycle;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.trello.rxlifecycle3.navi.NaviLifecycle;
 
 import org.junit.Test;
 
@@ -33,8 +33,8 @@
 import io.reactivex.subjects.PublishSubject;
 
 import static com.trello.navi2.internal.NaviEmitter.createActivityEmitter;
-import static com.trello.rxlifecycle2.android.ActivityEvent.STOP;
-import static com.trello.rxlifecycle2.navi.NaviLifecycle.createActivityLifecycleProvider;
+import static com.trello.rxlifecycle3.android.ActivityEvent.STOP;
+import static com.trello.rxlifecycle3.navi.NaviLifecycle.createActivityLifecycleProvider;
 import static io.reactivex.subjects.PublishSubject.create;
 import static org.junit.Assert.assertNull;
 
diff --git a/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle2/components/NaviFragmentLifecycleTest.java b/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle3/components/NaviFragmentLifecycleTest.java
similarity index 96%
rename from rxlifecycle-navi/src/test/java/com/trello/rxlifecycle2/components/NaviFragmentLifecycleTest.java
rename to rxlifecycle-navi/src/test/java/com/trello/rxlifecycle3/components/NaviFragmentLifecycleTest.java
index c8bd3c6..a592c3a 100644
--- a/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle2/components/NaviFragmentLifecycleTest.java
+++ b/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle3/components/NaviFragmentLifecycleTest.java
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components;
+package com.trello.rxlifecycle3.components;
 
 import android.os.Bundle;
 
 import com.trello.navi2.Event;
 import com.trello.navi2.NaviComponent;
 import com.trello.navi2.internal.NaviEmitter;
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.android.FragmentEvent;
-import com.trello.rxlifecycle2.navi.NaviLifecycle;
+import com.trello.rxlifecycle3.LifecycleProvider;
+import com.trello.rxlifecycle3.android.FragmentEvent;
+import com.trello.rxlifecycle3.navi.NaviLifecycle;
 
 import org.junit.Test;
 
@@ -33,8 +33,8 @@
 import io.reactivex.subjects.PublishSubject;
 
 import static com.trello.navi2.internal.NaviEmitter.createFragmentEmitter;
-import static com.trello.rxlifecycle2.android.FragmentEvent.STOP;
-import static com.trello.rxlifecycle2.navi.NaviLifecycle.createFragmentLifecycleProvider;
+import static com.trello.rxlifecycle3.android.FragmentEvent.STOP;
+import static com.trello.rxlifecycle3.navi.NaviLifecycle.createFragmentLifecycleProvider;
 import static io.reactivex.subjects.PublishSubject.create;
 import static org.junit.Assert.assertNull;
 
diff --git a/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle2/components/TestUtil.java b/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle3/components/TestUtil.java
similarity index 95%
rename from rxlifecycle-navi/src/test/java/com/trello/rxlifecycle2/components/TestUtil.java
rename to rxlifecycle-navi/src/test/java/com/trello/rxlifecycle3/components/TestUtil.java
index e292037..f9c3e3f 100644
--- a/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle2/components/TestUtil.java
+++ b/rxlifecycle-navi/src/test/java/com/trello/rxlifecycle3/components/TestUtil.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.components;
+package com.trello.rxlifecycle3.components;
 
 final class TestUtil {
 
diff --git a/rxlifecycle-sample/src/main/AndroidManifest.xml b/rxlifecycle-sample/src/main/AndroidManifest.xml
index 2bc1cd7..1965c8c 100644
--- a/rxlifecycle-sample/src/main/AndroidManifest.xml
+++ b/rxlifecycle-sample/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    package="com.trello.rxlifecycle2.sample"
+    package="com.trello.rxlifecycle3.sample"
     xmlns:android="http://schemas.android.com/apk/res/android"
     >
 
@@ -12,7 +12,7 @@
         android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
         >
         <activity
-            android:name="com.trello.rxlifecycle2.sample.MainActivity"
+            android:name="com.trello.rxlifecycle3.sample.MainActivity"
             android:label="@string/app_name"
             >
             <intent-filter>
@@ -23,7 +23,7 @@
         </activity>
 
         <activity
-            android:name="com.trello.rxlifecycle2.sample.KotlinActivity"
+            android:name="com.trello.rxlifecycle3.sample.KotlinActivity"
             android:label="@string/app_name_kotlin"
             >
             <intent-filter>
diff --git a/rxlifecycle-sample/src/main/java/com/trello/rxlifecycle2/sample/MainActivity.java b/rxlifecycle-sample/src/main/java/com/trello/rxlifecycle3/sample/MainActivity.java
similarity index 96%
rename from rxlifecycle-sample/src/main/java/com/trello/rxlifecycle2/sample/MainActivity.java
rename to rxlifecycle-sample/src/main/java/com/trello/rxlifecycle3/sample/MainActivity.java
index 0b68dc3..d2010df 100644
--- a/rxlifecycle-sample/src/main/java/com/trello/rxlifecycle2/sample/MainActivity.java
+++ b/rxlifecycle-sample/src/main/java/com/trello/rxlifecycle3/sample/MainActivity.java
@@ -12,13 +12,13 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.sample;
+package com.trello.rxlifecycle3.sample;
 
 import android.os.Bundle;
 import android.util.Log;
 
-import com.trello.rxlifecycle2.android.ActivityEvent;
-import com.trello.rxlifecycle2.components.support.RxAppCompatActivity;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/rxlifecycle-sample/src/main/kotlin/com/trello/rxlifecycle2/sample/KotlinActivity.kt b/rxlifecycle-sample/src/main/kotlin/com/trello/rxlifecycle3/sample/KotlinActivity.kt
similarity index 90%
rename from rxlifecycle-sample/src/main/kotlin/com/trello/rxlifecycle2/sample/KotlinActivity.kt
rename to rxlifecycle-sample/src/main/kotlin/com/trello/rxlifecycle3/sample/KotlinActivity.kt
index 9c2d268..ba805a7 100644
--- a/rxlifecycle-sample/src/main/kotlin/com/trello/rxlifecycle2/sample/KotlinActivity.kt
+++ b/rxlifecycle-sample/src/main/kotlin/com/trello/rxlifecycle3/sample/KotlinActivity.kt
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.sample
+package com.trello.rxlifecycle3.sample
 
 import android.os.Bundle
 import android.util.Log
-import com.trello.rxlifecycle2.android.ActivityEvent
-import com.trello.rxlifecycle2.components.support.RxAppCompatActivity
-import com.trello.rxlifecycle2.kotlin.bindToLifecycle
-import com.trello.rxlifecycle2.kotlin.bindUntilEvent
+import com.trello.rxlifecycle3.android.ActivityEvent
+import com.trello.rxlifecycle3.components.support.RxAppCompatActivity
+import com.trello.rxlifecycle3.kotlin.bindToLifecycle
+import com.trello.rxlifecycle3.kotlin.bindUntilEvent
 import io.reactivex.Observable
 import java.util.concurrent.TimeUnit
 
diff --git a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/Functions.java b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/Functions.java
similarity index 98%
rename from rxlifecycle/src/main/java/com/trello/rxlifecycle2/Functions.java
rename to rxlifecycle/src/main/java/com/trello/rxlifecycle3/Functions.java
index e911942..ac8465c 100644
--- a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/Functions.java
+++ b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/Functions.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import java.util.concurrent.CancellationException;
 
diff --git a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/LifecycleProvider.java b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/LifecycleProvider.java
similarity index 98%
rename from rxlifecycle/src/main/java/com/trello/rxlifecycle2/LifecycleProvider.java
rename to rxlifecycle/src/main/java/com/trello/rxlifecycle3/LifecycleProvider.java
index 7215567..cc9ccc4 100644
--- a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/LifecycleProvider.java
+++ b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/LifecycleProvider.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
diff --git a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/LifecycleTransformer.java b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/LifecycleTransformer.java
similarity index 97%
rename from rxlifecycle/src/main/java/com/trello/rxlifecycle2/LifecycleTransformer.java
rename to rxlifecycle/src/main/java/com/trello/rxlifecycle3/LifecycleTransformer.java
index 1eddbe8..64a1814 100644
--- a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/LifecycleTransformer.java
+++ b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/LifecycleTransformer.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.reactivestreams.Publisher;
 
@@ -34,7 +34,7 @@
 import io.reactivex.SingleSource;
 import io.reactivex.SingleTransformer;
 
-import static com.trello.rxlifecycle2.internal.Preconditions.checkNotNull;
+import static com.trello.rxlifecycle3.internal.Preconditions.checkNotNull;
 
 /**
  * Transformer that continues a subscription until a second Observable emits an event.
diff --git a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/OutsideLifecycleException.java b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/OutsideLifecycleException.java
similarity index 96%
rename from rxlifecycle/src/main/java/com/trello/rxlifecycle2/OutsideLifecycleException.java
rename to rxlifecycle/src/main/java/com/trello/rxlifecycle3/OutsideLifecycleException.java
index 1d81f5d..a395dcd 100644
--- a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/OutsideLifecycleException.java
+++ b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/OutsideLifecycleException.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import javax.annotation.Nullable;
 
diff --git a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/RxLifecycle.java b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/RxLifecycle.java
similarity index 97%
rename from rxlifecycle/src/main/java/com/trello/rxlifecycle2/RxLifecycle.java
rename to rxlifecycle/src/main/java/com/trello/rxlifecycle3/RxLifecycle.java
index 9717aed..6563c33 100644
--- a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/RxLifecycle.java
+++ b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/RxLifecycle.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
@@ -22,7 +22,7 @@
 import io.reactivex.functions.Function;
 import io.reactivex.functions.Predicate;
 
-import static com.trello.rxlifecycle2.internal.Preconditions.checkNotNull;
+import static com.trello.rxlifecycle3.internal.Preconditions.checkNotNull;
 
 public class RxLifecycle {
 
diff --git a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/internal/Preconditions.java b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/internal/Preconditions.java
similarity index 95%
rename from rxlifecycle/src/main/java/com/trello/rxlifecycle2/internal/Preconditions.java
rename to rxlifecycle/src/main/java/com/trello/rxlifecycle3/internal/Preconditions.java
index 6d5fc7e..04e7557 100644
--- a/rxlifecycle/src/main/java/com/trello/rxlifecycle2/internal/Preconditions.java
+++ b/rxlifecycle/src/main/java/com/trello/rxlifecycle3/internal/Preconditions.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2.internal;
+package com.trello.rxlifecycle3.internal;
 
 public final class Preconditions {
     public static <T> T checkNotNull(T value, String message) {
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/OutsideLifecycleExceptionTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/OutsideLifecycleExceptionTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/OutsideLifecycleExceptionTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/OutsideLifecycleExceptionTest.java
index b3f7107..1f503b6 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/OutsideLifecycleExceptionTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/OutsideLifecycleExceptionTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Test;
 
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/RxLifecycleTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/RxLifecycleTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
index ffc3b9a..3046d3f 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/RxLifecycleTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerCompletableTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerCompletableTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerCompletableTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerCompletableTest.java
index 607ea07..b80a9a0 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerCompletableTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerCompletableTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerFlowableTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerFlowableTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerFlowableTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerFlowableTest.java
index d512009..205d67f 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerFlowableTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerFlowableTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerMaybeTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerMaybeTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerMaybeTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerMaybeTest.java
index 95af6da..fe5d864 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerMaybeTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerMaybeTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerObservableTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerObservableTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerObservableTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerObservableTest.java
index c4da532..b9598f7 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerObservableTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerObservableTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerSingleTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerSingleTest.java
similarity index 99%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerSingleTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerSingleTest.java
index ab85aef..6053921 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilCorrespondingEventTransformerSingleTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilCorrespondingEventTransformerSingleTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerCompletableTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerCompletableTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerCompletableTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerCompletableTest.java
index 795964f..93bb5ad 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerCompletableTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerCompletableTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerFlowableTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerFlowableTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerFlowableTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerFlowableTest.java
index de6a830..a0974b0 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerFlowableTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerFlowableTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerMaybeTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerMaybeTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerMaybeTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerMaybeTest.java
index a4dd296..abf7866 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerMaybeTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerMaybeTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerObservableTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerObservableTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerObservableTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerObservableTest.java
index f52a298..04b6cca 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerObservableTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerObservableTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerSingleTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerSingleTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerSingleTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerSingleTest.java
index ad71ca2..6305615 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilEventTransformerSingleTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilEventTransformerSingleTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerCompletableTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerCompletableTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerCompletableTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerCompletableTest.java
index 702c839..38ce2c5 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerCompletableTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerCompletableTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerFlowableTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerFlowableTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerFlowableTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerFlowableTest.java
index 03dee9a..7c339f5 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerFlowableTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerFlowableTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerMaybeTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerMaybeTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerMaybeTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerMaybeTest.java
index be8cc2b..9c5d2a7 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerMaybeTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerMaybeTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerObservableTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerObservableTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerObservableTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerObservableTest.java
index b2fbc10..1a41bb5 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerObservableTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerObservableTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerSingleTest.java b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerSingleTest.java
similarity index 98%
rename from rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerSingleTest.java
rename to rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerSingleTest.java
index 7e2a2a3..b5cd1bd 100644
--- a/rxlifecycle/src/test/java/com/trello/rxlifecycle2/UntilLifecycleTransformerSingleTest.java
+++ b/rxlifecycle/src/test/java/com/trello/rxlifecycle3/UntilLifecycleTransformerSingleTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.trello.rxlifecycle2;
+package com.trello.rxlifecycle3;
 
 import org.junit.Before;
 import org.junit.Test;