diff --git a/app/lib/common/l10n.dart b/app/lib/common/l10n.dart
index ea973f338..5998909eb 100644
--- a/app/lib/common/l10n.dart
+++ b/app/lib/common/l10n.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-extension PharmeL10nContext on BuildContext {
+extension PharMeL10nContext on BuildContext {
   AppLocalizations get l10n => AppLocalizations.of(this)!;
 }
 
diff --git a/app/lib/common/pages/medications/medication.dart b/app/lib/common/pages/medications/medication.dart
index de4ff8609..d8b13076e 100644
--- a/app/lib/common/pages/medications/medication.dart
+++ b/app/lib/common/pages/medications/medication.dart
@@ -73,13 +73,13 @@ class MedicationPage extends StatelessWidget {
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            Text(medication.name, style: PharmeTheme.textTheme.displaySmall),
+            Text(medication.name, style: PharMeTheme.textTheme.displaySmall),
             IconButton(
               onPressed: () => sharePdf(medication),
               icon: Icon(
                 Icons.ios_share,
                 size: 32,
-                color: PharmeTheme.primaryColor,
+                color: PharMeTheme.primaryColor,
               ),
             ),
           ],
@@ -88,12 +88,12 @@ class MedicationPage extends StatelessWidget {
           Container(
             padding: EdgeInsets.all(6),
             decoration: BoxDecoration(
-              color: PharmeTheme.onSurfaceColor,
+              color: PharMeTheme.onSurfaceColor,
               borderRadius: BorderRadius.all(Radius.circular(6)),
             ),
             child: Text(
               medication.drugclass!,
-              style: PharmeTheme.textTheme.titleMedium!.copyWith(
+              style: PharMeTheme.textTheme.titleMedium!.copyWith(
                 fontWeight: FontWeight.w100,
               ),
             ),
diff --git a/app/lib/common/pages/medications/widgets/annotation_card.dart b/app/lib/common/pages/medications/widgets/annotation_card.dart
index 7072342fb..92b66b218 100644
--- a/app/lib/common/pages/medications/widgets/annotation_card.dart
+++ b/app/lib/common/pages/medications/widgets/annotation_card.dart
@@ -62,7 +62,7 @@ class ClinicalAnnotationCard extends StatelessWidget {
         child: Text(
           medication.guidelines[0].implication ??
               medication.guidelines[0].cpicImplication!,
-          style: PharmeTheme.textTheme.bodySmall,
+          style: PharMeTheme.textTheme.bodySmall,
         ),
       ),
     ]);
@@ -76,14 +76,14 @@ class ClinicalAnnotationCard extends StatelessWidget {
           context.l10n.medications_page_gene_name(
             medication.guidelines[0].phenotype.geneSymbol.name,
           ),
-          style: PharmeTheme.textTheme.bodyLarge!.copyWith(
+          style: PharMeTheme.textTheme.bodyLarge!.copyWith(
             color: Colors.black.withOpacity(0.5),
           ),
         ),
         Row(children: [
           Text(
             medication.guidelines[0].cpicClassification!.toUpperCase(),
-            style: PharmeTheme.textTheme.bodyLarge!.copyWith(
+            style: PharMeTheme.textTheme.bodyLarge!.copyWith(
               fontWeight: FontWeight.bold,
               color: Colors.black.withOpacity(0.7),
             ),
diff --git a/app/lib/common/pages/medications/widgets/disclaimer.dart b/app/lib/common/pages/medications/widgets/disclaimer.dart
index 1119294b0..74172d9e3 100644
--- a/app/lib/common/pages/medications/widgets/disclaimer.dart
+++ b/app/lib/common/pages/medications/widgets/disclaimer.dart
@@ -12,20 +12,20 @@ class Disclaimer extends StatelessWidget {
       padding: EdgeInsets.all(4),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.all(Radius.circular(8)),
-        color: PharmeTheme.surfaceColor,
-        border: Border.all(color: PharmeTheme.errorColor, width: 1.2),
+        color: PharMeTheme.surfaceColor,
+        border: Border.all(color: PharMeTheme.errorColor, width: 1.2),
       ),
       child: Row(children: [
         Icon(
           Icons.warning_rounded,
           size: 52,
-          color: PharmeTheme.errorColor,
+          color: PharMeTheme.errorColor,
         ),
         SizedBox(width: 8),
         Flexible(
           child: Text(
             context.l10n.medications_page_disclaimer,
-            style: PharmeTheme.textTheme.labelMedium!.copyWith(
+            style: PharMeTheme.textTheme.labelMedium!.copyWith(
               fontWeight: FontWeight.w100,
             ),
           ),
diff --git a/app/lib/common/pages/medications/widgets/recommendation_card.dart b/app/lib/common/pages/medications/widgets/recommendation_card.dart
index b4deb1da5..8a45b0d07 100644
--- a/app/lib/common/pages/medications/widgets/recommendation_card.dart
+++ b/app/lib/common/pages/medications/widgets/recommendation_card.dart
@@ -42,7 +42,7 @@ class RecommendationCard extends StatelessWidget {
           Text(
             medication.guidelines[0].recommendation ??
                 medication.guidelines[0].cpicRecommendation!,
-            style: PharmeTheme.textTheme.bodyLarge,
+            style: PharMeTheme.textTheme.bodyLarge,
           ),
         ]),
       ),
diff --git a/app/lib/common/pages/medications/widgets/source_card.dart b/app/lib/common/pages/medications/widgets/source_card.dart
index 905e964e8..cba70109f 100644
--- a/app/lib/common/pages/medications/widgets/source_card.dart
+++ b/app/lib/common/pages/medications/widgets/source_card.dart
@@ -21,8 +21,8 @@ class SourceCard extends StatelessWidget {
         decoration: BoxDecoration(
           borderRadius: BorderRadius.all(Radius.circular(8)),
           gradient: LinearGradient(colors: [
-            PharmeTheme.primaryColor.withOpacity(0.8),
-            PharmeTheme.secondaryColor.withOpacity(0.8),
+            PharMeTheme.primaryColor.withOpacity(0.8),
+            PharMeTheme.secondaryColor.withOpacity(0.8),
           ]),
         ),
         child: Padding(
@@ -32,7 +32,7 @@ class SourceCard extends StatelessWidget {
               flex: 3,
               child: Text(
                 name,
-                style: PharmeTheme.textTheme.bodyMedium!.copyWith(
+                style: PharMeTheme.textTheme.bodyMedium!.copyWith(
                   color: Colors.white,
                 ),
               ),
@@ -42,7 +42,7 @@ class SourceCard extends StatelessWidget {
               flex: 10,
               child: Text(
                 description,
-                style: PharmeTheme.textTheme.bodySmall!.copyWith(
+                style: PharMeTheme.textTheme.bodySmall!.copyWith(
                   color: Colors.white,
                 ),
               ),
diff --git a/app/lib/common/pages/medications/widgets/sub_header.dart b/app/lib/common/pages/medications/widgets/sub_header.dart
index 8c30abf74..5f589f960 100644
--- a/app/lib/common/pages/medications/widgets/sub_header.dart
+++ b/app/lib/common/pages/medications/widgets/sub_header.dart
@@ -20,7 +20,7 @@ class SubHeader extends StatelessWidget {
       children: [
         Text(
           title.toUpperCase(),
-          style: PharmeTheme.textTheme.bodySmall!.copyWith(letterSpacing: 2),
+          style: PharMeTheme.textTheme.bodySmall!.copyWith(letterSpacing: 2),
         ),
         if (tooltip.isNotNullOrBlank) ...[
           SizedBox(width: 8),
diff --git a/app/lib/common/theme.dart b/app/lib/common/theme.dart
index 762ecdd3b..a2d2bfd27 100644
--- a/app/lib/common/theme.dart
+++ b/app/lib/common/theme.dart
@@ -2,7 +2,7 @@ import 'package:black_hole_flutter/black_hole_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
-class PharmeTheme {
+class PharMeTheme {
   static ThemeData get light {
     return ThemeData(
       colorScheme: ColorScheme(
diff --git a/app/lib/common/widgets/app.dart b/app/lib/common/widgets/app.dart
index 7c915df5a..cafc12b24 100644
--- a/app/lib/common/widgets/app.dart
+++ b/app/lib/common/widgets/app.dart
@@ -3,8 +3,8 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import '../models/metadata.dart';
 import '../module.dart' hide MetaData;
 
-class PharmeApp extends StatelessWidget {
-  PharmeApp({Key? key}) : super(key: key);
+class PharMeApp extends StatelessWidget {
+  PharMeApp({Key? key}) : super(key: key);
 
   final _appRouter = AppRouter();
   final _isLoggedIn = MetaData.instance.isLoggedIn ?? false;
@@ -16,7 +16,7 @@ class PharmeApp extends StatelessWidget {
       routerDelegate: _appRouter.delegate(
         initialDeepLink: _isLoggedIn ? 'main' : 'onboarding',
       ),
-      theme: PharmeTheme.light,
+      theme: PharMeTheme.light,
       localizationsDelegates: [
         AppLocalizations.delegate,
         GlobalMaterialLocalizations.delegate,
diff --git a/app/lib/common/widgets/headings.dart b/app/lib/common/widgets/headings.dart
index b5e68e1b6..ec83f8a33 100644
--- a/app/lib/common/widgets/headings.dart
+++ b/app/lib/common/widgets/headings.dart
@@ -12,6 +12,6 @@ class Heading extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Text(text, style: PharmeTheme.textTheme.titleMedium);
+    return Text(text, style: PharMeTheme.textTheme.titleMedium);
   }
 }
diff --git a/app/lib/faq/pages/faq.dart b/app/lib/faq/pages/faq.dart
index 97ec7c000..2d2db864d 100644
--- a/app/lib/faq/pages/faq.dart
+++ b/app/lib/faq/pages/faq.dart
@@ -27,8 +27,8 @@ class FaqPage extends StatelessWidget {
       decoration: BoxDecoration(
         gradient: LinearGradient(
           colors: [
-            PharmeTheme.primaryColor.shade500,
-            PharmeTheme.primaryColor.shade800,
+            PharMeTheme.primaryColor.shade500,
+            PharMeTheme.primaryColor.shade800,
           ],
         ),
         borderRadius: BorderRadius.circular(16),
@@ -49,13 +49,13 @@ class FaqPage extends StatelessWidget {
               children: [
                 Text(
                   context.l10n.faq_pharmacogenomics,
-                  style: PharmeTheme.textTheme.titleLarge!
+                  style: PharMeTheme.textTheme.titleLarge!
                       .copyWith(color: Colors.white),
                 ),
                 SizedBox(height: 8),
                 Text(
                   context.l10n.faq_page_description,
-                  style: PharmeTheme.textTheme.bodyMedium!
+                  style: PharMeTheme.textTheme.bodyMedium!
                       .copyWith(color: Colors.white),
                 ),
               ],
diff --git a/app/lib/main.dart b/app/lib/main.dart
index 0c7f5f61f..15e286506 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -3,6 +3,6 @@ import 'common/module.dart';
 Future<void> main() async {
   await initServices();
   await fetchAndSaveLookups();
-  runApp(PharmeApp());
+  runApp(PharMeApp());
   await cleanupServices();
 }
diff --git a/app/lib/onboarding/pages/onboarding.dart b/app/lib/onboarding/pages/onboarding.dart
index 6b37e8e38..d33b51a1c 100644
--- a/app/lib/onboarding/pages/onboarding.dart
+++ b/app/lib/onboarding/pages/onboarding.dart
@@ -133,7 +133,7 @@ class OnboardingPage extends HookWidget {
       height: 8,
       width: isActive ? 24 : 16,
       decoration: BoxDecoration(
-        color: isActive ? Colors.white : PharmeTheme.onSurfaceColor,
+        color: isActive ? Colors.white : PharMeTheme.onSurfaceColor,
         borderRadius: BorderRadius.all(Radius.circular(12)),
       ),
     );
@@ -165,7 +165,7 @@ class OnboardingPage extends HookWidget {
             isLastPage
                 ? context.l10n.onboarding_get_started
                 : context.l10n.onboarding_next,
-            style: PharmeTheme.textTheme.headlineSmall!
+            style: PharMeTheme.textTheme.headlineSmall!
                 .copyWith(color: Colors.white),
           ),
           SizedBox(width: 8),
@@ -215,14 +215,14 @@ class OnboardingSubPage extends StatelessWidget {
           SizedBox(height: 32),
           Text(
             getHeader(context),
-            style: PharmeTheme.textTheme.headlineLarge!.copyWith(
+            style: PharMeTheme.textTheme.headlineLarge!.copyWith(
               color: Colors.white,
             ),
           ),
           SizedBox(height: 16),
           Text(
             getText(context),
-            style: PharmeTheme.textTheme.bodyMedium!.copyWith(
+            style: PharMeTheme.textTheme.bodyMedium!.copyWith(
               color: Colors.white,
             ),
           ),
@@ -253,7 +253,7 @@ class BottomCard extends StatelessWidget {
           Expanded(
             child: Text(
               getText(context),
-              style: PharmeTheme.textTheme.bodyMedium,
+              style: PharMeTheme.textTheme.bodyMedium,
               textAlign: (icon != null) ? TextAlign.start : TextAlign.center,
             ),
           ),
diff --git a/app/lib/reports/pages/reports.dart b/app/lib/reports/pages/reports.dart
index c7437e2e0..748793d48 100644
--- a/app/lib/reports/pages/reports.dart
+++ b/app/lib/reports/pages/reports.dart
@@ -92,7 +92,7 @@ class SliverReportsHeaderDelegate extends SliverPersistentHeaderDelegate {
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(16),
       ),
-      color: PharmeTheme.secondaryColor,
+      color: PharMeTheme.secondaryColor,
       clipBehavior: Clip.hardEdge,
       child: Padding(
         padding: const EdgeInsets.all(8),
@@ -100,7 +100,7 @@ class SliverReportsHeaderDelegate extends SliverPersistentHeaderDelegate {
           Text(
             context.l10n.reports_page_disclaimer_title,
             style:
-                PharmeTheme.textTheme.titleLarge!.copyWith(color: Colors.white),
+                PharMeTheme.textTheme.titleLarge!.copyWith(color: Colors.white),
           ),
           SizedBox(height: 8),
           Expanded(
@@ -108,7 +108,7 @@ class SliverReportsHeaderDelegate extends SliverPersistentHeaderDelegate {
               Flexible(
                 child: Text(
                   context.l10n.reports_page_disclaimer_text,
-                  style: PharmeTheme.textTheme.bodyMedium!
+                  style: PharMeTheme.textTheme.bodyMedium!
                       .copyWith(color: Colors.white),
                 ),
               ),
@@ -164,14 +164,14 @@ class ReportCard extends StatelessWidget {
                       SizedBox(width: 12),
                       Text(
                         medicationName,
-                        style: PharmeTheme.textTheme.titleMedium,
+                        style: PharMeTheme.textTheme.titleMedium,
                       ),
                     ]),
                     if (medicationIndication.isNotNullOrBlank) ...[
                       SizedBox(height: 12),
                       Text(
                         medicationIndication!,
-                        style: PharmeTheme.textTheme.titleSmall,
+                        style: PharMeTheme.textTheme.titleSmall,
                       ),
                     ]
                   ],
diff --git a/app/lib/search/pages/search.dart b/app/lib/search/pages/search.dart
index ea0b06580..6103df25f 100644
--- a/app/lib/search/pages/search.dart
+++ b/app/lib/search/pages/search.dart
@@ -26,8 +26,8 @@ class SearchPage extends HookWidget {
                     begin: Alignment.topLeft,
                     end: Alignment.bottomRight,
                     colors: [
-                      PharmeTheme.primaryColor,
-                      PharmeTheme.secondaryColor,
+                      PharMeTheme.primaryColor,
+                      PharMeTheme.secondaryColor,
                     ],
                   ),
                 ),
@@ -37,7 +37,7 @@ class SearchPage extends HookWidget {
                     SvgPicture.asset('assets/images/logo.svg'),
                     Text(
                       context.l10n.search_page_typeInMedication,
-                      style: PharmeTheme.textTheme.bodyLarge!.copyWith(
+                      style: PharMeTheme.textTheme.bodyLarge!.copyWith(
                         color: Colors.white,
                       ),
                     ),
@@ -145,7 +145,7 @@ class MedicationCard extends StatelessWidget {
                   Flexible(
                     child: Text(
                       medicationName,
-                      style: PharmeTheme.textTheme.titleMedium,
+                      style: PharMeTheme.textTheme.titleMedium,
                     ),
                   ),
                   Icon(Icons.arrow_forward_ios),
@@ -155,7 +155,7 @@ class MedicationCard extends StatelessWidget {
               if (medicationDescription.isNotNullOrBlank)
                 Text(
                   medicationDescription!,
-                  style: PharmeTheme.textTheme.titleSmall,
+                  style: PharMeTheme.textTheme.titleSmall,
                 )
             ],
           ),
diff --git a/app/lib/settings/pages/about_us.dart b/app/lib/settings/pages/about_us.dart
index 13427cf42..1c412847d 100644
--- a/app/lib/settings/pages/about_us.dart
+++ b/app/lib/settings/pages/about_us.dart
@@ -6,7 +6,7 @@ class AboutUsPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: PharmeTheme.backgroundColor,
+      color: PharMeTheme.backgroundColor,
       child: Padding(
         padding: const EdgeInsets.all(16),
         child: Column(
@@ -16,7 +16,7 @@ class AboutUsPage extends StatelessWidget {
               margin: EdgeInsets.only(bottom: 16),
               child: Text(
                 context.l10n.settings_page_about_us,
-                style: PharmeTheme.textTheme.headlineSmall,
+                style: PharMeTheme.textTheme.headlineSmall,
               ),
             ),
             Text(context.l10n.settings_page_about_us_text)
diff --git a/app/lib/settings/pages/privacy_policy.dart b/app/lib/settings/pages/privacy_policy.dart
index 3c69b8187..b70001529 100644
--- a/app/lib/settings/pages/privacy_policy.dart
+++ b/app/lib/settings/pages/privacy_policy.dart
@@ -6,7 +6,7 @@ class PrivacyPolicyPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: PharmeTheme.backgroundColor,
+      color: PharMeTheme.backgroundColor,
       child: Padding(
         padding: const EdgeInsets.all(16),
         child: Column(
@@ -16,7 +16,7 @@ class PrivacyPolicyPage extends StatelessWidget {
               margin: EdgeInsets.only(bottom: 16),
               child: Text(
                 context.l10n.settings_page_privacy_policy,
-                style: PharmeTheme.textTheme.headlineSmall,
+                style: PharMeTheme.textTheme.headlineSmall,
               ),
             ),
             Text(context.l10n.settings_page_privacy_policy_text)
diff --git a/app/lib/settings/pages/settings.dart b/app/lib/settings/pages/settings.dart
index d3f59c379..023f41dd1 100644
--- a/app/lib/settings/pages/settings.dart
+++ b/app/lib/settings/pages/settings.dart
@@ -10,7 +10,7 @@ class SettingsPage extends StatelessWidget {
       ListTile(
         title: Text(
           context.l10n.settings_page_account_settings,
-          style: PharmeTheme.textTheme.bodyLarge,
+          style: PharMeTheme.textTheme.bodyLarge,
         ),
       ),
       ListTile(
@@ -25,7 +25,7 @@ class SettingsPage extends StatelessWidget {
       ListTile(
         title: Text(
           context.l10n.settings_page_more,
-          style: PharmeTheme.textTheme.bodyLarge,
+          style: PharMeTheme.textTheme.bodyLarge,
         ),
       ),
       ListTile(
diff --git a/app/lib/settings/pages/terms_and_conditions.dart b/app/lib/settings/pages/terms_and_conditions.dart
index 5bf36886d..55aeb97a3 100644
--- a/app/lib/settings/pages/terms_and_conditions.dart
+++ b/app/lib/settings/pages/terms_and_conditions.dart
@@ -6,7 +6,7 @@ class TermsAndConditionsPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: PharmeTheme.backgroundColor,
+      color: PharMeTheme.backgroundColor,
       child: Padding(
         padding: const EdgeInsets.all(16),
         child: Column(
@@ -16,7 +16,7 @@ class TermsAndConditionsPage extends StatelessWidget {
               margin: EdgeInsets.only(bottom: 16),
               child: Text(
                 context.l10n.settings_page_terms_and_conditions,
-                style: PharmeTheme.textTheme.headlineSmall,
+                style: PharMeTheme.textTheme.headlineSmall,
               ),
             ),
             Text(context.l10n.settings_page_terms_and_conditions_text)
diff --git a/docs/FLUTTER_STYLE.md b/docs/FLUTTER_STYLE.md
index cd657ee8f..c49bd65ea 100644
--- a/docs/FLUTTER_STYLE.md
+++ b/docs/FLUTTER_STYLE.md
@@ -26,7 +26,7 @@ Wrap arguments with trailing comma if they exceed the char limit of 80 per line:
 
 ```dart
 return Container(
-  color: PharmeTheme.primaryColor,
+  color: PharMeTheme.primaryColor,
   padding: EdgeInsets.symmetric(horizontal: 16),
   child: myChild,
 );