diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3cef0e4..4274a89 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -47,7 +47,7 @@ android {
         applicationId "de.voidspace.contacts_plus"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 18
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/lib/api_client.dart b/lib/api_client.dart
index 477f674..74a1bbf 100644
--- a/lib/api_client.dart
+++ b/lib/api_client.dart
@@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:http/http.dart' as http;
-import 'package:contacts_plus/models/authentication_data.dart';
+import 'package:contacts_plus_plus/models/authentication_data.dart';
 import 'package:uuid/uuid.dart';
 
 import 'config.dart';
diff --git a/lib/apis/friend_api.dart b/lib/apis/friend_api.dart
index 36f7feb..e67cdeb 100644
--- a/lib/apis/friend_api.dart
+++ b/lib/apis/friend_api.dart
@@ -1,9 +1,9 @@
 
 import 'dart:convert';
 
-import 'package:contacts_plus/api_client.dart';
-import 'package:contacts_plus/models/friend.dart';
-import 'package:contacts_plus/models/user.dart';
+import 'package:contacts_plus_plus/api_client.dart';
+import 'package:contacts_plus_plus/models/friend.dart';
+import 'package:contacts_plus_plus/models/user.dart';
 
 class FriendApi {
   static Future<Iterable<Friend>> getFriendsList(ApiClient client) async {
diff --git a/lib/apis/message_api.dart b/lib/apis/message_api.dart
index 20eda0c..cb25f9c 100644
--- a/lib/apis/message_api.dart
+++ b/lib/apis/message_api.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:contacts_plus/api_client.dart';
-import 'package:contacts_plus/models/message.dart';
+import 'package:contacts_plus_plus/api_client.dart';
+import 'package:contacts_plus_plus/models/message.dart';
 
 class MessageApi {
   static Future<Iterable<Message>> getUserMessages(ApiClient client, {String userId="", DateTime? fromTime, int maxItems=50, bool unreadOnly=false}) async {
diff --git a/lib/apis/user_api.dart b/lib/apis/user_api.dart
index c64cb15..6c99758 100644
--- a/lib/apis/user_api.dart
+++ b/lib/apis/user_api.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:contacts_plus/api_client.dart';
-import 'package:contacts_plus/models/user.dart';
+import 'package:contacts_plus_plus/api_client.dart';
+import 'package:contacts_plus_plus/models/user.dart';
 
 class UserApi {
   static Future<Iterable<User>> searchUsers(ApiClient client, {required String needle}) async {
diff --git a/lib/auxiliary.dart b/lib/auxiliary.dart
index 9e8b79f..e87f418 100644
--- a/lib/auxiliary.dart
+++ b/lib/auxiliary.dart
@@ -1,4 +1,4 @@
-import 'package:contacts_plus/config.dart';
+import 'package:contacts_plus_plus/config.dart';
 import 'package:path/path.dart' as p;
 
 enum NeosDBEndpoint
diff --git a/lib/main.dart b/lib/main.dart
index 3fba588..af81eff 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,23 +1,23 @@
-import 'package:contacts_plus/models/message.dart';
-import 'package:contacts_plus/neos_hub.dart';
-import 'package:contacts_plus/widgets/home_screen.dart';
-import 'package:contacts_plus/widgets/login_screen.dart';
+import 'package:contacts_plus_plus/models/message.dart';
+import 'package:contacts_plus_plus/neos_hub.dart';
+import 'package:contacts_plus_plus/widgets/home_screen.dart';
+import 'package:contacts_plus_plus/widgets/login_screen.dart';
 import 'package:flutter/material.dart';
 import 'api_client.dart';
 import 'models/authentication_data.dart';
 
 void main() {
-  runApp(const ContactsPlus());
+  runApp(const ContactsPlusPlus());
 }
 
-class ContactsPlus extends StatefulWidget {
-  const ContactsPlus({super.key});
+class ContactsPlusPlus extends StatefulWidget {
+  const ContactsPlusPlus({super.key});
 
   @override
-  State<ContactsPlus> createState() => _ContactsPlusState();
+  State<ContactsPlusPlus> createState() => _ContactsPlusPlusState();
 }
 
-class _ContactsPlusState extends State<ContactsPlus> {
+class _ContactsPlusPlusState extends State<ContactsPlusPlus> {
   final Typography _typography = Typography.material2021(platform: TargetPlatform.android);
   AuthenticationData _authData = AuthenticationData.unauthenticated();
   final Map<String, MessageCache> _messageCache = {};
@@ -31,7 +31,7 @@ class _ContactsPlusState extends State<ContactsPlus> {
         authenticationData: _authData,
         child: MaterialApp(
           debugShowCheckedModeBanner: false,
-          title: 'Contacts+',
+          title: 'Contacts++',
           theme: ThemeData(
             useMaterial3: true,
             textTheme: _typography.white,
diff --git a/lib/models/friend.dart b/lib/models/friend.dart
index 8f3ff8a..aff2c26 100644
--- a/lib/models/friend.dart
+++ b/lib/models/friend.dart
@@ -1,6 +1,6 @@
 import 'dart:developer';
 
-import 'package:contacts_plus/models/user_profile.dart';
+import 'package:contacts_plus_plus/models/user_profile.dart';
 
 class Friend extends Comparable {
   final String id;
diff --git a/lib/models/message.dart b/lib/models/message.dart
index 7c1e42b..e5a6f4d 100644
--- a/lib/models/message.dart
+++ b/lib/models/message.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:developer';
 
-import 'package:contacts_plus/config.dart';
+import 'package:contacts_plus_plus/config.dart';
 import 'package:uuid/uuid.dart';
 
 enum MessageType {
diff --git a/lib/models/user.dart b/lib/models/user.dart
index 81fda11..01385c2 100644
--- a/lib/models/user.dart
+++ b/lib/models/user.dart
@@ -1,4 +1,4 @@
-import 'package:contacts_plus/models/user_profile.dart';
+import 'package:contacts_plus_plus/models/user_profile.dart';
 
 class User {
   final String id;
diff --git a/lib/neos_hub.dart b/lib/neos_hub.dart
index a4329c1..db53791 100644
--- a/lib/neos_hub.dart
+++ b/lib/neos_hub.dart
@@ -1,13 +1,13 @@
 
 import 'dart:convert';
 import 'dart:developer';
-import 'package:contacts_plus/models/authentication_data.dart';
+import 'package:contacts_plus_plus/models/authentication_data.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 
-import 'package:contacts_plus/api_client.dart';
-import 'package:contacts_plus/config.dart';
-import 'package:contacts_plus/models/message.dart';
+import 'package:contacts_plus_plus/api_client.dart';
+import 'package:contacts_plus_plus/config.dart';
+import 'package:contacts_plus_plus/models/message.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
 enum EventType {
diff --git a/lib/widgets/friend_list_tile.dart b/lib/widgets/friend_list_tile.dart
index 2421dd5..d5f1b1f 100644
--- a/lib/widgets/friend_list_tile.dart
+++ b/lib/widgets/friend_list_tile.dart
@@ -1,8 +1,7 @@
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:contacts_plus/aux.dart';
-import 'package:contacts_plus/models/friend.dart';
-import 'package:contacts_plus/widgets/generic_avatar.dart';
-import 'package:contacts_plus/widgets/messages.dart';
+import 'package:contacts_plus_plus/auxiliary.dart';
+import 'package:contacts_plus_plus/models/friend.dart';
+import 'package:contacts_plus_plus/widgets/generic_avatar.dart';
+import 'package:contacts_plus_plus/widgets/messages.dart';
 import 'package:flutter/material.dart';
 
 class FriendListTile extends StatelessWidget {
diff --git a/lib/widgets/home_screen.dart b/lib/widgets/home_screen.dart
index bbf5cff..73ae4ba 100644
--- a/lib/widgets/home_screen.dart
+++ b/lib/widgets/home_screen.dart
@@ -1,13 +1,13 @@
 import 'dart:async';
 
-import 'package:contacts_plus/api_client.dart';
-import 'package:contacts_plus/apis/friend_api.dart';
-import 'package:contacts_plus/apis/user_api.dart';
-import 'package:contacts_plus/models/friend.dart';
-import 'package:contacts_plus/models/user.dart';
-import 'package:contacts_plus/widgets/expanding_input_fab.dart';
-import 'package:contacts_plus/widgets/friend_list_tile.dart';
-import 'package:contacts_plus/widgets/user_list_tile.dart';
+import 'package:contacts_plus_plus/api_client.dart';
+import 'package:contacts_plus_plus/apis/friend_api.dart';
+import 'package:contacts_plus_plus/apis/user_api.dart';
+import 'package:contacts_plus_plus/models/friend.dart';
+import 'package:contacts_plus_plus/models/user.dart';
+import 'package:contacts_plus_plus/widgets/expanding_input_fab.dart';
+import 'package:contacts_plus_plus/widgets/friend_list_tile.dart';
+import 'package:contacts_plus_plus/widgets/user_list_tile.dart';
 import 'package:flutter/material.dart';
 
 class HomeScreen extends StatefulWidget {
diff --git a/lib/widgets/login_screen.dart b/lib/widgets/login_screen.dart
index b04ea15..b808cc1 100644
--- a/lib/widgets/login_screen.dart
+++ b/lib/widgets/login_screen.dart
@@ -1,5 +1,5 @@
-import 'package:contacts_plus/api_client.dart';
-import 'package:contacts_plus/models/authentication_data.dart';
+import 'package:contacts_plus_plus/api_client.dart';
+import 'package:contacts_plus_plus/models/authentication_data.dart';
 import 'package:flutter/material.dart';
 
 class LoginScreen extends StatefulWidget {
diff --git a/lib/widgets/messages.dart b/lib/widgets/messages.dart
index 90ccef7..9cad5e0 100644
--- a/lib/widgets/messages.dart
+++ b/lib/widgets/messages.dart
@@ -1,10 +1,9 @@
-import 'package:contacts_plus/api_client.dart';
-import 'package:contacts_plus/apis/message_api.dart';
-import 'package:contacts_plus/aux.dart';
-import 'package:contacts_plus/models/friend.dart';
-import 'package:contacts_plus/models/message.dart';
-import 'package:contacts_plus/neos_hub.dart';
-import 'package:contacts_plus/widgets/generic_avatar.dart';
+import 'package:contacts_plus_plus/api_client.dart';
+import 'package:contacts_plus_plus/apis/message_api.dart';
+import 'package:contacts_plus_plus/models/friend.dart';
+import 'package:contacts_plus_plus/models/message.dart';
+import 'package:contacts_plus_plus/neos_hub.dart';
+import 'package:contacts_plus_plus/widgets/generic_avatar.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
diff --git a/lib/widgets/user_list_tile.dart b/lib/widgets/user_list_tile.dart
index 1289e68..d74ca71 100644
--- a/lib/widgets/user_list_tile.dart
+++ b/lib/widgets/user_list_tile.dart
@@ -1,5 +1,5 @@
-import 'package:contacts_plus/models/user.dart';
-import 'package:contacts_plus/widgets/generic_avatar.dart';
+import 'package:contacts_plus_plus/models/user.dart';
+import 'package:contacts_plus_plus/widgets/generic_avatar.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
diff --git a/pubspec.yaml b/pubspec.yaml
index cb9ab33..697c3c4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,4 +1,4 @@
-name: contacts_plus
+name: contacts_plus_plus
 description: Messenger App for Neos VR contacts
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 60edc3f..87adcf2 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:contacts_plus/main.dart';
+import 'package:contacts_plus_plus/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(ContactsPlus());
+    await tester.pumpWidget(ContactsPlusPlus());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);