diff --git a/lib/screens/connect/model/connect_model.dart b/lib/screens/connect/model/connect.model.dart
similarity index 100%
rename from lib/screens/connect/model/connect_model.dart
rename to lib/screens/connect/model/connect.model.dart
diff --git a/lib/screens/connect/provider/connect_provider.dart b/lib/screens/connect/provider/connect.provider.dart
similarity index 97%
rename from lib/screens/connect/provider/connect_provider.dart
rename to lib/screens/connect/provider/connect.provider.dart
index 9ed2ca9..670c8dd 100644
--- a/lib/screens/connect/provider/connect_provider.dart
+++ b/lib/screens/connect/provider/connect.provider.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-import 'package:my_linkding/screens/connect/model/connect_model.dart';
+import 'package:my_linkding/screens/connect/model/connect.model.dart';
 
 import 'package:my_linkding/providers/server_instances_provider.dart';
 import 'package:my_linkding/i18n/strings.g.dart';
@@ -15,7 +15,7 @@ import 'package:my_linkding/services/api_client.dart';
 import 'package:my_linkding/constants/regexp.dart';
 import 'package:my_linkding/helpers/wrapped_class.dart';
 
-part 'connect_provider.g.dart';
+part 'connect.provider.g.dart';
 
 @riverpod
 class Connect extends _$Connect {
diff --git a/lib/screens/connect/provider/connect_provider.g.dart b/lib/screens/connect/provider/connect.provider.g.dart
similarity index 97%
rename from lib/screens/connect/provider/connect_provider.g.dart
rename to lib/screens/connect/provider/connect.provider.g.dart
index d19e7ff..049f5b2 100644
--- a/lib/screens/connect/provider/connect_provider.g.dart
+++ b/lib/screens/connect/provider/connect.provider.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'connect_provider.dart';
+part of 'connect.provider.dart';
 
 // **************************************************************************
 // RiverpodGenerator
diff --git a/lib/screens/connect/ui/connect.dart b/lib/screens/connect/ui/connect.dart
index c71cba4..c30cb02 100644
--- a/lib/screens/connect/ui/connect.dart
+++ b/lib/screens/connect/ui/connect.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:my_linkding/constants/enums.dart';
 
-import 'package:my_linkding/screens/connect/provider/connect_provider.dart';
+import 'package:my_linkding/screens/connect/provider/connect.provider.dart';
 import 'package:segmented_button_slide/segmented_button_slide.dart';
 
 class Connect extends ConsumerWidget {
diff --git a/lib/screens/links/model/links_model.dart b/lib/screens/links/model/links.model.dart
similarity index 100%
rename from lib/screens/links/model/links_model.dart
rename to lib/screens/links/model/links.model.dart
diff --git a/lib/screens/links/provider/links.provider.dart b/lib/screens/links/provider/links.provider.dart
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/lib/screens/links/provider/links.provider.dart
@@ -0,0 +1 @@
+
diff --git a/lib/screens/links/provider/links_provider.dart b/lib/screens/links/provider/links_provider.dart
deleted file mode 100644
index e69de29..0000000