diff --git a/README.md b/README.md
index c3c5805..b528ba6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# flutter_expense_tracker
+# Recurring Expense Tracker
 
 Recurring expense tracker app for Android.
 
diff --git a/android/app/build.gradle b/android/app/build.gradle.IGNORE
similarity index 100%
rename from android/app/build.gradle
rename to android/app/build.gradle.IGNORE
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 4407489..56ea049 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "com.hyperling.flutter_expense_tracker"
+    namespace = "com.hyperling.expense_tracker"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
@@ -21,7 +21,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.hyperling.flutter_expense_tracker"
+        applicationId = "com.hyperling.expense_tracker"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
diff --git a/android/app/src/main/kotlin/com/example/flutter_empty/MainActivity.kt b/android/app/src/main/kotlin/com/example/flutter_empty/MainActivity.kt
deleted file mode 100644
index de0c895..0000000
--- a/android/app/src/main/kotlin/com/example/flutter_empty/MainActivity.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.example.flutter_empty
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity()
diff --git a/android/app/src/main/kotlin/com/hyperling/flutter_expense_tracker/MainActivity.kt b/android/app/src/main/kotlin/com/hyperling/expense_tracker/MainActivity.kt
similarity index 66%
rename from android/app/src/main/kotlin/com/hyperling/flutter_expense_tracker/MainActivity.kt
rename to android/app/src/main/kotlin/com/hyperling/expense_tracker/MainActivity.kt
index 80f3d81..ff2cf6f 100644
--- a/android/app/src/main/kotlin/com/hyperling/flutter_expense_tracker/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/hyperling/expense_tracker/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.hyperling.flutter_expense_tracker
+package com.hyperling.expense_tracker
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/android/build.gradle b/android/build.gradle.IGNORE
similarity index 100%
rename from android/build.gradle
rename to android/build.gradle.IGNORE
diff --git a/lib/models/expense.dart b/lib/models/expense.dart
index 3d3c63a..97a3d0e 100644
--- a/lib/models/expense.dart
+++ b/lib/models/expense.dart
@@ -1,5 +1,5 @@
 // Local
-import 'package:flutter_expense_tracker/models/item_type.dart';
+import '/models/item_type.dart';
 
 import '/models/tracked_item.dart';
 import '/models/frequency.dart';
diff --git a/lib/models/tracked_item.dart b/lib/models/tracked_item.dart
index 53a4585..d415f44 100644
--- a/lib/models/tracked_item.dart
+++ b/lib/models/tracked_item.dart
@@ -1,5 +1,5 @@
 // Local
-import 'package:flutter_expense_tracker/models/item_type.dart';
+import '/models/item_type.dart';
 
 import '/models/frequency.dart';
 
@@ -37,17 +37,19 @@ abstract class TrackedItem {
   }
 
   Map<String, dynamic> toMap() {
-    return frequency == null ? {
-      'id': id,
-      'name': name,
-      'amount': amount,
-      'description': description,
-    } : {
-      'id': id,
-      'name': name,
-      'amount': amount,
-      'frequency': frequency!.title,
-      'description': description,
-    };
+    return frequency == null
+        ? {
+            'id': id,
+            'name': name,
+            'amount': amount,
+            'description': description,
+          }
+        : {
+            'id': id,
+            'name': name,
+            'amount': amount,
+            'frequency': frequency!.title,
+            'description': description,
+          };
   }
 }
diff --git a/lib/pages/home.dart b/lib/pages/home.dart
index e320d97..b5791e0 100644
--- a/lib/pages/home.dart
+++ b/lib/pages/home.dart
@@ -1,6 +1,6 @@
 // Flutter
 import 'package:flutter/material.dart';
-import 'package:flutter_expense_tracker/models/item_type.dart';
+import '/models/item_type.dart';
 import 'dart:io';
 
 // Local
diff --git a/lib/pages/report.dart b/lib/pages/report.dart
index 7a58623..079508c 100644
--- a/lib/pages/report.dart
+++ b/lib/pages/report.dart
@@ -1,6 +1,6 @@
 // Flutter
 import 'package:flutter/material.dart';
-import 'package:flutter_expense_tracker/models/item_type.dart';
+import '/models/item_type.dart';
 
 // Local
 import '/db.dart';
diff --git a/lib/pages/tracked_item.dart b/lib/pages/tracked_item.dart
index 39502c7..cbe911a 100644
--- a/lib/pages/tracked_item.dart
+++ b/lib/pages/tracked_item.dart
@@ -1,7 +1,7 @@
 // Flutter
 import 'package:flutter/material.dart';
-import 'package:flutter_expense_tracker/models/asset.dart';
-import 'package:flutter_expense_tracker/models/income.dart';
+import '/models/asset.dart';
+import '/models/income.dart';
 
 // Local
 import '/models/tracked_item.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 67bedb2..de3332c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,4 +1,4 @@
-name: flutter_expense_tracker
+name: expense_tracker
 description: Track recurring expenses against income and liquid assets.
 publish_to: 'none'
 version: 0.1.0
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 648a40c..6005fe8 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -8,12 +8,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:flutter_expense_tracker/main.dart';
+import 'package:expense_tracker/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
+    await tester.pumpWidget(const MainApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);