diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
index f8c62a2c..96634a23 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
@@ -96,25 +96,25 @@ public class BaseUserInterfaceTest
 
         Habit h1 = fixtures.createEmptyHabit();
         h1.setName("Wake up early");
-        h1.setDescription("Did you wake up early today?");
+        h1.setQuestion("Did you wake up early today?");
         h1.setColor(5);
         habitList.update(h1);
 
         Habit h2 = fixtures.createShortHabit();
         h2.setName("Track time");
-        h2.setDescription("Did you track your time?");
+        h2.setQuestion("Did you track your time?");
         h2.setColor(5);
         habitList.update(h2);
 
         Habit h3 = fixtures.createLongHabit();
         h3.setName("Meditate");
-        h3.setDescription("Did meditate today?");
+        h3.setQuestion("Did meditate today?");
         h3.setColor(10);
         habitList.update(h3);
 
         Habit h4 = fixtures.createEmptyHabit();
         h4.setName("Read books");
-        h4.setDescription("Did you read books today?");
+        h4.setQuestion("Did you read books today?");
         h4.setColor(2);
         habitList.update(h4);
     }
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
index c636f682..38da787d 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
@@ -52,7 +52,7 @@ public class HabitFixtures
     {
         Habit habit = modelFactory.buildHabit();
         habit.setName("Meditate");
-        habit.setDescription("Did you meditate this morning?");
+        habit.setQuestion("Did you meditate this morning?");
         habit.setColor(5);
         habit.setFrequency(Frequency.DAILY);
         habit.setId(id);
@@ -81,7 +81,7 @@ public class HabitFixtures
     {
         Habit habit = modelFactory.buildHabit();
         habit.setName("Take a walk");
-        habit.setDescription("How many steps did you walk today?");
+        habit.setQuestion("How many steps did you walk today?");
         habit.setType(Habit.NUMBER_HABIT);
         habit.setTargetType(Habit.AT_LEAST);
         habit.setTargetValue(200.0);
@@ -103,7 +103,7 @@ public class HabitFixtures
     {
         Habit habit = modelFactory.buildHabit();
         habit.setName("Wake up early");
-        habit.setDescription("Did you wake up before 6am?");
+        habit.setQuestion("Did you wake up before 6am?");
         habit.setFrequency(new Frequency(2, 3));
         habitList.add(habit);
 
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
index ac860586..dfc5b9a2 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
@@ -64,7 +64,7 @@ public class SubtitleCard extends HabitCard
 
         if (habit.hasReminder()) updateReminderText(habit.getReminder());
 
-        if (habit.getDescription().isEmpty()) questionLabel.setVisibility(GONE);
+        if (habit.getQuestion().isEmpty()) questionLabel.setVisibility(GONE);
 
         invalidate();
     }
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
index 76a6132a..78e2bc1e 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
@@ -115,7 +115,7 @@ class AndroidNotificationTray
         val builder = NotificationCompat.Builder(context, REMINDERS_CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_notification)
                 .setContentTitle(habit.name)
-                .setContentText(if(habit.description.isNullOrBlank()) defaultText else habit.description)
+                .setContentText(if(habit.question.isBlank()) defaultText else habit.question)
                 .setContentIntent(pendingIntents.showHabit(habit))
                 .setDeleteIntent(pendingIntents.dismissNotification(habit))
                 .addAction(addRepetitionAction)
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java
index 3873b4ad..dbf89216 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java
@@ -67,7 +67,7 @@ public class HabitBullCSVImporter extends AbstractImporter
             String name = line[0];
             if (name.equals("HabitName")) continue;
 
-            String description = line[1];
+            String question = line[1];
             String dateString[] = line[3].split("-");
             int year = Integer.parseInt(dateString[0]);
             int month = Integer.parseInt(dateString[1]);
@@ -87,7 +87,7 @@ public class HabitBullCSVImporter extends AbstractImporter
             {
                 h = modelFactory.buildHabit();
                 h.setName(name);
-                h.setDescription(description);
+                h.setQuestion(question);
                 h.setFrequency(Frequency.DAILY);
                 habitList.add(h);
                 map.put(name, h);
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java
index 1f0299f4..10136f1d 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java
@@ -92,7 +92,7 @@ public class RewireDBImporter extends AbstractImporter
             {
                 int id = c.getInt(0);
                 String name = c.getString(1);
-                String description = c.getString(2);
+                String question = c.getString(2);
                 int schedule = c.getInt(3);
                 String activeDays = c.getString(4);
                 int repeatingCount = c.getInt(5);
@@ -101,7 +101,7 @@ public class RewireDBImporter extends AbstractImporter
 
                 Habit habit = modelFactory.buildHabit();
                 habit.setName(name);
-                habit.setDescription(description);
+                habit.setQuestion(question);
 
                 int periods[] = { 7, 31, 365 };
                 int numerator, denominator;
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java
index af7ecb99..2e9b9462 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java
@@ -123,11 +123,11 @@ public class TickmateDBImporter extends AbstractImporter
             {
                 int id = c.getInt(0);
                 String name = c.getString(1);
-                String description = c.getString(2);
+                String question = c.getString(2);
 
                 Habit habit = modelFactory.buildHabit();
                 habit.setName(name);
-                habit.setDescription(description);
+                habit.setQuestion(question);
                 habit.setFrequency(Frequency.DAILY);
                 habitList.add(habit);
 
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java
index ae843e8d..c14d3ca7 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java
@@ -228,7 +228,7 @@ public abstract class HabitList implements Iterable<Habit>
             String[] cols = {
                 String.format("%03d", indexOf(habit) + 1),
                 habit.getName(),
-                habit.getDescription(),
+                habit.getQuestion(),
                 Integer.toString(freq.getNumerator()),
                 Integer.toString(freq.getDenominator()),
                 ColorConstants.CSV_PALETTE[habit.getColor()]
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java
index 929367fd..5e1e3edb 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java
@@ -43,7 +43,7 @@ public class HabitFixtures
     {
         Habit habit = modelFactory.buildHabit();
         habit.setName("Meditate");
-        habit.setDescription("Did you meditate this morning?");
+        habit.setQuestion("Did you meditate this morning?");
         habit.setColor(3);
         habit.setFrequency(Frequency.DAILY);
         saveIfSQLite(habit);
@@ -73,7 +73,7 @@ public class HabitFixtures
         Habit habit = modelFactory.buildHabit();
         habit.setType(Habit.NUMBER_HABIT);
         habit.setName("Run");
-        habit.setDescription("How many miles did you run today?");
+        habit.setQuestion("How many miles did you run today?");
         habit.setUnit("miles");
         habit.setTargetType(Habit.AT_LEAST);
         habit.setTargetValue(2.0);
@@ -98,7 +98,7 @@ public class HabitFixtures
         Habit habit = modelFactory.buildHabit();
         habit.setType(Habit.NUMBER_HABIT);
         habit.setName("Walk");
-        habit.setDescription("How many steps did you walk today?");
+        habit.setQuestion("How many steps did you walk today?");
         habit.setUnit("steps");
         habit.setTargetType(Habit.AT_LEAST);
         habit.setTargetValue(100);
@@ -133,7 +133,7 @@ public class HabitFixtures
     {
         Habit habit = modelFactory.buildHabit();
         habit.setName("Wake up early");
-        habit.setDescription("Did you wake up before 6am?");
+        habit.setQuestion("Did you wake up before 6am?");
         habit.setFrequency(new Frequency(2, 3));
         saveIfSQLite(habit);
 
diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java
index 73671d7e..820ff593 100644
--- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java
+++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java
@@ -52,7 +52,7 @@ public class ImportTest extends BaseUnitTest
 
         Habit habit = habitList.getByPosition(0);
         assertThat(habit.getName(), equalTo("Breed dragons"));
-        assertThat(habit.getDescription(), equalTo("with love and fire"));
+        assertThat(habit.getQuestion(), equalTo("with love and fire"));
         assertThat(habit.getFrequency(), equalTo(Frequency.DAILY));
         assertTrue(containsRepetition(habit, 2016, 3, 18));
         assertTrue(containsRepetition(habit, 2016, 3, 19));
diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
index 206caafe..7d76d919 100644
--- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
+++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
@@ -218,13 +218,13 @@ public class HabitListTest extends BaseUnitTest
 
         Habit h1 = fixtures.createEmptyHabit();
         h1.setName("Meditate");
-        h1.setDescription("Did you meditate this morning?");
+        h1.setQuestion("Did you meditate this morning?");
         h1.setFrequency(Frequency.DAILY);
         h1.setColor(3);
 
         Habit h2 = fixtures.createEmptyHabit();
         h2.setName("Wake up early");
-        h2.setDescription("Did you wake up before 6am?");
+        h2.setQuestion("Did you wake up before 6am?");
         h2.setFrequency(new Frequency(2, 3));
         h2.setColor(5);
 
diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java
index 30b92af0..e6b016a6 100644
--- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java
+++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java
@@ -36,7 +36,7 @@ public class HabitRecordTest extends BaseUnitTest
     {
         Habit original = modelFactory.buildHabit();
         original.setName("Hello world");
-        original.setDescription("Did you greet the world today?");
+        original.setQuestion("Did you greet the world today?");
         original.setColor(1);
         original.setArchived(true);
         original.setFrequency(Frequency.THREE_TIMES_PER_WEEK);
@@ -58,7 +58,7 @@ public class HabitRecordTest extends BaseUnitTest
     {
         Habit original = modelFactory.buildHabit();
         original.setName("Hello world");
-        original.setDescription("Did you greet the world today?");
+        original.setQuestion("Did you greet the world today?");
         original.setColor(5);
         original.setArchived(false);
         original.setFrequency(Frequency.DAILY);