diff --git a/lib/api/auth.dart b/lib/api/auth.dart
index e5a7246..d9ba587 100644
--- a/lib/api/auth.dart
+++ b/lib/api/auth.dart
@@ -3,7 +3,7 @@ import 'dart:developer';
 import 'dart:io';
 
 import 'package:filcnaplo/models/settings.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:home_widget/home_widget.dart';
diff --git a/lib/models/premium_result.dart b/lib/models/premium_result.dart
index 41383ae..5f674ec 100644
--- a/lib/models/premium_result.dart
+++ b/lib/models/premium_result.dart
@@ -1,4 +1,4 @@
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
 
 class PremiumResult {
   final String accessToken;
diff --git a/lib/providers/premium_provider.dart b/lib/providers/premium_provider.dart
index 9809fb4..50c8298 100644
--- a/lib/providers/premium_provider.dart
+++ b/lib/providers/premium_provider.dart
@@ -1,5 +1,5 @@
 import 'package:filcnaplo/models/settings.dart';
-import 'package:filcnaplo_premium/api/auth.dart';
+import 'package:refilc_plus/api/auth.dart';
 import 'package:flutter/widgets.dart';
 
 class PremiumProvider extends ChangeNotifier {
diff --git a/lib/ui/mobile/goal_planner/goal_complete_modal.dart b/lib/ui/mobile/goal_planner/goal_complete_modal.dart
index cce1654..2671f44 100644
--- a/lib/ui/mobile/goal_planner/goal_complete_modal.dart
+++ b/lib/ui/mobile/goal_planner/goal_complete_modal.dart
@@ -3,7 +3,7 @@ import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/theme/colors/colors.dart';
 import 'package:filcnaplo_kreta_api/models/subject.dart';
 import 'package:filcnaplo_mobile_ui/common/average_display.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_state_screen.i18n.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_state_screen.i18n.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
diff --git a/lib/ui/mobile/goal_planner/goal_planner_screen.dart b/lib/ui/mobile/goal_planner/goal_planner_screen.dart
index 6dfebf8..387b2b6 100644
--- a/lib/ui/mobile/goal_planner/goal_planner_screen.dart
+++ b/lib/ui/mobile/goal_planner/goal_planner_screen.dart
@@ -10,10 +10,10 @@ import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
 import 'package:filcnaplo_mobile_ui/common/average_display.dart';
 import 'package:filcnaplo_mobile_ui/common/round_border_icon.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/calculator/grade_calculator_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_input.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_planner.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_planner_screen.i18n.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/route_option.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_input.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner_screen.i18n.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/route_option.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
diff --git a/lib/ui/mobile/goal_planner/goal_state_screen.dart b/lib/ui/mobile/goal_planner/goal_state_screen.dart
index 7135dbd..8659300 100644
--- a/lib/ui/mobile/goal_planner/goal_state_screen.dart
+++ b/lib/ui/mobile/goal_planner/goal_state_screen.dart
@@ -11,10 +11,10 @@ import 'package:filcnaplo_mobile_ui/common/average_display.dart';
 import 'package:filcnaplo_mobile_ui/common/panel/panel.dart';
 import 'package:filcnaplo_mobile_ui/common/progress_bar.dart';
 import 'package:filcnaplo_mobile_ui/common/round_border_icon.dart';
-import 'package:filcnaplo_premium/providers/goal_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_planner.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_state_screen.i18n.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/route_option.dart';
+import 'package:refilc_plus/providers/goal_provider.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_state_screen.i18n.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/route_option.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
diff --git a/lib/ui/mobile/goal_planner/grade_display.dart b/lib/ui/mobile/goal_planner/grade_display.dart
index 88f2181..ff26d6d 100644
--- a/lib/ui/mobile/goal_planner/grade_display.dart
+++ b/lib/ui/mobile/goal_planner/grade_display.dart
@@ -1,5 +1,5 @@
 import 'package:filcnaplo/models/settings.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_input.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_input.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
diff --git a/lib/ui/mobile/goal_planner/graph.dart b/lib/ui/mobile/goal_planner/graph.dart
index 724b84a..e7226ae 100644
--- a/lib/ui/mobile/goal_planner/graph.dart
+++ b/lib/ui/mobile/goal_planner/graph.dart
@@ -4,7 +4,7 @@ import 'package:filcnaplo/helpers/average_helper.dart';
 import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/theme/colors/colors.dart';
 import 'package:filcnaplo_kreta_api/models/grade.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/graph.i18n.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/graph.i18n.dart';
 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/ui/mobile/goal_planner/route_option.dart b/lib/ui/mobile/goal_planner/route_option.dart
index bb1a1a7..b36add7 100644
--- a/lib/ui/mobile/goal_planner/route_option.dart
+++ b/lib/ui/mobile/goal_planner/route_option.dart
@@ -1,7 +1,7 @@
 import 'package:filcnaplo/theme/colors/colors.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_planner.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_planner_screen.i18n.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/grade_display.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner_screen.i18n.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/grade_display.dart';
 import 'package:flutter/material.dart';
 
 enum RouteMark { recommended, fastest }
diff --git a/lib/ui/mobile/premium/activation_view/activation_dashboard.dart b/lib/ui/mobile/premium/activation_view/activation_dashboard.dart
index 3577588..e4b137b 100644
--- a/lib/ui/mobile/premium/activation_view/activation_dashboard.dart
+++ b/lib/ui/mobile/premium/activation_view/activation_dashboard.dart
@@ -1,5 +1,5 @@
 import 'package:filcnaplo/theme/colors/colors.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:flutter_svg/svg.dart';
diff --git a/lib/ui/mobile/premium/activation_view/activation_view.dart b/lib/ui/mobile/premium/activation_view/activation_view.dart
index 232f0fb..5d0b5ab 100644
--- a/lib/ui/mobile/premium/activation_view/activation_view.dart
+++ b/lib/ui/mobile/premium/activation_view/activation_view.dart
@@ -1,6 +1,6 @@
 import 'package:animations/animations.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/activation_view/activation_dashboard.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
+import 'package:refilc_plus/ui/mobile/premium/activation_view/activation_dashboard.dart';
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/ui/mobile/premium/premium_inline.dart b/lib/ui/mobile/premium/premium_inline.dart
index e5ab39f..67fc1c1 100644
--- a/lib/ui/mobile/premium/premium_inline.dart
+++ b/lib/ui/mobile/premium/premium_inline.dart
@@ -1,4 +1,4 @@
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
+import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
 import 'package:flutter/material.dart';
 
 enum PremiumInlineFeature { nickname, theme, widget, goal, stats }
diff --git a/lib/ui/mobile/settings/app_icon_screen.dart b/lib/ui/mobile/settings/app_icon_screen.dart
index aec8a4f..4357099 100644
--- a/lib/ui/mobile/settings/app_icon_screen.dart
+++ b/lib/ui/mobile/settings/app_icon_screen.dart
@@ -2,10 +2,10 @@ import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/theme/colors/colors.dart';
 import 'package:filcnaplo_mobile_ui/common/panel/panel.dart';
 // import 'package:filcnaplo_mobile_ui/common/panel/panel_button.dart';
-import 'package:filcnaplo_premium/helpers/app_icon_helper.dart';
-// import 'package:filcnaplo_premium/models/premium_scopes.dart';
-// import 'package:filcnaplo_premium/providers/premium_provider.dart';
-// import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
+import 'package:refilc_plus/helpers/app_icon_helper.dart';
+// import 'package:refilc_plus/models/premium_scopes.dart';
+// import 'package:refilc_plus/providers/premium_provider.dart';
+// import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/ui/mobile/settings/modify_teacher_names.dart b/lib/ui/mobile/settings/modify_teacher_names.dart
index 7669238..a92afe6 100644
--- a/lib/ui/mobile/settings/modify_teacher_names.dart
+++ b/lib/ui/mobile/settings/modify_teacher_names.dart
@@ -10,9 +10,9 @@ import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/timetable_provider.dart';
 import 'package:filcnaplo_mobile_ui/common/panel/panel.dart';
 import 'package:filcnaplo_mobile_ui/common/panel/panel_button.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
+import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
diff --git a/lib/ui/mobile/settings/welcome_message.dart b/lib/ui/mobile/settings/welcome_message.dart
index 456510d..7199ba8 100644
--- a/lib/ui/mobile/settings/welcome_message.dart
+++ b/lib/ui/mobile/settings/welcome_message.dart
@@ -1,9 +1,9 @@
 import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo_mobile_ui/common/panel/panel_button.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
+import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/settings_screen.i18n.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 7ff72be..268f548 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,4 +1,4 @@
-name: filcnaplo_premium
+name: refilc_plus
 publish_to: "none"
 
 environment:
@@ -9,11 +9,13 @@ dependencies:
     sdk: flutter
   cupertino_icons: ^1.0.2
 
-  # Filcnaplo main dep
+  # reFilc Main
   filcnaplo:
     path: ../filcnaplo/
+  # e-KRETA API (kreten) client
   filcnaplo_kreta_api:
     path: ../filcnaplo_kreta_api/
+  # reFilc Mobile UI
   filcnaplo_mobile_ui:
     path: "../filcnaplo_mobile_ui/"