diff --git a/app/src/main/java/net/foucry/pilldroid/CustomScannerActivity.java b/app/src/main/java/net/foucry/pilldroid/CustomScannerActivity.java
index 5a55f4e..5d08003 100644
--- a/app/src/main/java/net/foucry/pilldroid/CustomScannerActivity.java
+++ b/app/src/main/java/net/foucry/pilldroid/CustomScannerActivity.java
@@ -38,7 +38,7 @@ public class CustomScannerActivity extends Activity implements DecoratedBarcodeV
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.CustomScannerActivty);
+        setContentView(R.layout.custom_scanner_activty);
 
         //barcodeScannerView.setTorchListener(this);
 
diff --git a/app/src/main/java/net/foucry/pilldroid/DrugDetailActivity.java b/app/src/main/java/net/foucry/pilldroid/DrugDetailActivity.java
index b205f36..d5315ef 100644
--- a/app/src/main/java/net/foucry/pilldroid/DrugDetailActivity.java
+++ b/app/src/main/java/net/foucry/pilldroid/DrugDetailActivity.java
@@ -41,7 +41,7 @@ public class DrugDetailActivity extends AppCompatActivity {
         aMedic = (Medic) bundle.get("medic");
         Log.d(TAG, "aMedic == " + aMedic);
 
-        setContentView(R.layout.DrugDetailActivity);
+        setContentView(R.layout.drug_detail_activity);
         Toolbar toolbar = findViewById(detail_toolbar);
 
         if (toolbar != null) {
diff --git a/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java b/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java
index dad6084..06d2523 100644
--- a/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java
+++ b/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java
@@ -108,7 +108,7 @@ public class DrugListActivity extends AppCompatActivity {
                 .build();
 
         // Set view content
-        setContentView(R.layout.DrugListActivity);
+        setContentView(R.layout.drug_list_activity);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
 
diff --git a/app/src/main/java/net/foucry/pilldroid/WelcomeActivity.java b/app/src/main/java/net/foucry/pilldroid/WelcomeActivity.java
index 3ee81f3..1816f83 100644
--- a/app/src/main/java/net/foucry/pilldroid/WelcomeActivity.java
+++ b/app/src/main/java/net/foucry/pilldroid/WelcomeActivity.java
@@ -45,7 +45,7 @@ public class WelcomeActivity extends AppCompatActivity {
         }
 
         prefManager.setFirstTimeLaunch(false);
-        setContentView(R.layout.WelcomeActivity);
+        setContentView(R.layout.welcome_activity);
 
         setFullScreen();
 
diff --git a/app/src/main/res/layout/CustomScannerActivty.xml b/app/src/main/res/layout/custom_scanner_activty.xml
similarity index 100%
rename from app/src/main/res/layout/CustomScannerActivty.xml
rename to app/src/main/res/layout/custom_scanner_activty.xml
diff --git a/app/src/main/res/layout/DrugDetailActivity.xml b/app/src/main/res/layout/drug_detail_activity.xml
similarity index 100%
rename from app/src/main/res/layout/DrugDetailActivity.xml
rename to app/src/main/res/layout/drug_detail_activity.xml
diff --git a/app/src/main/res/layout/DrugListActivity.xml b/app/src/main/res/layout/drug_list_activity.xml
similarity index 100%
rename from app/src/main/res/layout/DrugListActivity.xml
rename to app/src/main/res/layout/drug_list_activity.xml
diff --git a/app/src/main/res/layout/WelcomeActivity.xml b/app/src/main/res/layout/welcome_activity.xml
similarity index 100%
rename from app/src/main/res/layout/WelcomeActivity.xml
rename to app/src/main/res/layout/welcome_activity.xml