diff --git a/build.gradle b/build.gradle
index 07a88f9f..cb99ac40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,4 +22,4 @@ allprojects {
mavenCentral()
}
-}
\ No newline at end of file
+}
diff --git a/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableAccount.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableAccount.java
index e4105adf..b0c2dd14 100644
--- a/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableAccount.java
+++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableAccount.java
@@ -27,9 +27,9 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import org.mariotaku.querybuilder.Columns.Column;
-import org.mariotaku.querybuilder.Expression;
-import org.mariotaku.querybuilder.RawItemArray;
+import org.getlantern.querybuilder.Columns.Column;
+import org.getlantern.querybuilder.Expression;
+import org.getlantern.querybuilder.RawItemArray;
import org.getlantern.firetweet.provider.FiretweetDataStore.Accounts;
import org.getlantern.firetweet.util.TwitterContentUtils;
import org.getlantern.firetweet.util.content.ContentResolverUtils;
diff --git a/firetweet.component.nyan/src/main/res/values-land/integers.xml b/firetweet.component.nyan/src/main/res/values-land/integers.xml
index 36fa4264..0ca9c819 100644
--- a/firetweet.component.nyan/src/main/res/values-land/integers.xml
+++ b/firetweet.component.nyan/src/main/res/values-land/integers.xml
@@ -3,4 +3,4 @@
5
17
-
\ No newline at end of file
+
diff --git a/firetweet.donate.nyanwp/src/main/res/values-land/integers.xml b/firetweet.donate.nyanwp/src/main/res/values-land/integers.xml
index 36fa4264..0ca9c819 100644
--- a/firetweet.donate.nyanwp/src/main/res/values-land/integers.xml
+++ b/firetweet.donate.nyanwp/src/main/res/values-land/integers.xml
@@ -3,4 +3,4 @@
5
17
-
\ No newline at end of file
+
diff --git a/firetweet.donate.nyanwp/src/main/res/values/colors.xml b/firetweet.donate.nyanwp/src/main/res/values/colors.xml
index ddf994ac..4c46e095 100644
--- a/firetweet.donate.nyanwp/src/main/res/values/colors.xml
+++ b/firetweet.donate.nyanwp/src/main/res/values/colors.xml
@@ -3,4 +3,4 @@
#003366
-
\ No newline at end of file
+
diff --git a/firetweet.extension.twitlonger/src/androidTest/java/org/mariotaku/extension/twitlonger/ApplicationTest.java b/firetweet.extension.twitlonger/src/androidTest/java/org/mariotaku/extension/twitlonger/ApplicationTest.java
index 34fe2cdb..9a361b03 100644
--- a/firetweet.extension.twitlonger/src/androidTest/java/org/mariotaku/extension/twitlonger/ApplicationTest.java
+++ b/firetweet.extension.twitlonger/src/androidTest/java/org/mariotaku/extension/twitlonger/ApplicationTest.java
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-package org.mariotaku.extension.twitlonger;
+package org.getlantern.extension.twitlonger;
import android.app.Application;
import android.test.ApplicationTestCase;