diff --git a/app/build.gradle b/app/build.gradle
index 9a88b59..c3c8bf4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,22 +3,22 @@ apply plugin: 'com.android.application'
 
 ext.versionMajor = 0
 ext.versionMinor = 2
-ext.versionPatch = 1
+ext.versionPatch = 2
 ext.versionClassifier = null
-ext.isSnapshot = false
+ext.isSnapshot = true
 ext.minimumSdkVersion = 16
 
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "cat.polpadilla.eventreminder"
+        applicationId "com.polpg.eventreminder"
         minSdkVersion project.ext.minimumSdkVersion
         targetSdkVersion 28
         versionCode generateVersionCode()
         versionName generateVersionName()
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
-        testApplicationId "cat.polpadilla.eventreminder.test"
+        testApplicationId "com.polpg.eventreminder.test"
     }
     buildTypes {
         release {
@@ -69,9 +69,9 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.0.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
-    implementation 'androidx.room:room-runtime:2.1.0-alpha03'
-    implementation 'androidx.room:room-rxjava2:2.1.0-alpha03'
-    annotationProcessor 'androidx.room:room-compiler:2.1.0-alpha03'
+    implementation 'androidx.room:room-runtime:2.1.0-alpha04'
+    implementation 'androidx.room:room-rxjava2:2.1.0-alpha04'
+    annotationProcessor 'androidx.room:room-compiler:2.1.0-alpha04'
     annotationProcessor "com.google.auto.value:auto-value:1.6.2"
     api "com.google.auto.value:auto-value-annotations:1.6.2"
     implementation 'me.everything:overscroll-decor-android:1.0.4'
diff --git a/app/src/androidTest/java/cat/polpadilla/eventreminder/ControllerTest.java b/app/src/androidTest/java/com/polpg/eventreminder/ControllerTest.java
similarity index 99%
rename from app/src/androidTest/java/cat/polpadilla/eventreminder/ControllerTest.java
rename to app/src/androidTest/java/com/polpg/eventreminder/ControllerTest.java
index 3d1d378..dd4f9fc 100644
--- a/app/src/androidTest/java/cat/polpadilla/eventreminder/ControllerTest.java
+++ b/app/src/androidTest/java/com/polpg/eventreminder/ControllerTest.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import com.prolificinteractive.materialcalendarview.CalendarDay;
 
diff --git a/app/src/androidTest/java/cat/polpadilla/eventreminder/RepoTests.java b/app/src/androidTest/java/com/polpg/eventreminder/RepoTests.java
similarity index 98%
rename from app/src/androidTest/java/cat/polpadilla/eventreminder/RepoTests.java
rename to app/src/androidTest/java/com/polpg/eventreminder/RepoTests.java
index bdffdd4..2bc013f 100644
--- a/app/src/androidTest/java/cat/polpadilla/eventreminder/RepoTests.java
+++ b/app/src/androidTest/java/com/polpg/eventreminder/RepoTests.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1a3a434..9baa8d8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cat.polpadilla.eventreminder">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.polpg.eventreminder">
 
     <application
         android:name=".EventApp"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".MainActivity"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="portrait">
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/Action.java b/app/src/main/java/com/polpg/eventreminder/Action.java
similarity index 97%
rename from app/src/main/java/cat/polpadilla/eventreminder/Action.java
rename to app/src/main/java/com/polpg/eventreminder/Action.java
index 8b4f6d1..62025fa 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/Action.java
+++ b/app/src/main/java/com/polpg/eventreminder/Action.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import com.google.auto.value.AutoValue;
 
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/Controller.java b/app/src/main/java/com/polpg/eventreminder/Controller.java
similarity index 98%
rename from app/src/main/java/cat/polpadilla/eventreminder/Controller.java
rename to app/src/main/java/com/polpg/eventreminder/Controller.java
index c2a1d35..6d1f7f2 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/Controller.java
+++ b/app/src/main/java/com/polpg/eventreminder/Controller.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/DatePickerFragment.java b/app/src/main/java/com/polpg/eventreminder/DatePickerFragment.java
similarity index 95%
rename from app/src/main/java/cat/polpadilla/eventreminder/DatePickerFragment.java
rename to app/src/main/java/com/polpg/eventreminder/DatePickerFragment.java
index 98471bb..792a0d0 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/DatePickerFragment.java
+++ b/app/src/main/java/com/polpg/eventreminder/DatePickerFragment.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.app.DatePickerDialog;
 import android.app.Dialog;
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/DisplayFragment.java b/app/src/main/java/com/polpg/eventreminder/DisplayFragment.java
similarity index 96%
rename from app/src/main/java/cat/polpadilla/eventreminder/DisplayFragment.java
rename to app/src/main/java/com/polpg/eventreminder/DisplayFragment.java
index a3d92de..8b297fb 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/DisplayFragment.java
+++ b/app/src/main/java/com/polpg/eventreminder/DisplayFragment.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.os.Bundle;
 import android.text.format.DateUtils;
@@ -15,7 +15,7 @@
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
-import cat.polpadilla.eventreminder.databinding.EventDisplayBinding;
+import com.polpg.eventreminder.databinding.EventDisplayBinding;
 
 public class DisplayFragment extends Fragment {
     private static final String ARG_ID="id";
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/EditFragment.java b/app/src/main/java/com/polpg/eventreminder/EditFragment.java
similarity index 98%
rename from app/src/main/java/cat/polpadilla/eventreminder/EditFragment.java
rename to app/src/main/java/com/polpg/eventreminder/EditFragment.java
index fc10fc3..e7b8821 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/EditFragment.java
+++ b/app/src/main/java/com/polpg/eventreminder/EditFragment.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.app.DatePickerDialog;
 import android.app.TimePickerDialog;
@@ -26,7 +26,7 @@
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
-import cat.polpadilla.eventreminder.databinding.EventEditBinding;
+import com.polpg.eventreminder.databinding.EventEditBinding;
 
 public class EditFragment extends Fragment
         implements DatePickerDialog.OnDateSetListener, TimePickerDialog.OnTimeSetListener{
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/EventApp.java b/app/src/main/java/com/polpg/eventreminder/EventApp.java
similarity index 95%
rename from app/src/main/java/cat/polpadilla/eventreminder/EventApp.java
rename to app/src/main/java/com/polpg/eventreminder/EventApp.java
index af2f404..91284b9 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/EventApp.java
+++ b/app/src/main/java/com/polpg/eventreminder/EventApp.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.app.Application;
 import android.os.Handler;
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/EventDatabase.java b/app/src/main/java/com/polpg/eventreminder/EventDatabase.java
similarity index 95%
rename from app/src/main/java/cat/polpadilla/eventreminder/EventDatabase.java
rename to app/src/main/java/com/polpg/eventreminder/EventDatabase.java
index 95fc3d9..baec72e 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/EventDatabase.java
+++ b/app/src/main/java/com/polpg/eventreminder/EventDatabase.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/EventEntity.java b/app/src/main/java/com/polpg/eventreminder/EventEntity.java
similarity index 97%
rename from app/src/main/java/cat/polpadilla/eventreminder/EventEntity.java
rename to app/src/main/java/com/polpg/eventreminder/EventEntity.java
index 788df48..b9d62a6 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/EventEntity.java
+++ b/app/src/main/java/com/polpg/eventreminder/EventEntity.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import java.util.Calendar;
 import java.util.List;
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/EventModel.java b/app/src/main/java/com/polpg/eventreminder/EventModel.java
similarity index 98%
rename from app/src/main/java/cat/polpadilla/eventreminder/EventModel.java
rename to app/src/main/java/com/polpg/eventreminder/EventModel.java
index 9649772..c5c36a1 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/EventModel.java
+++ b/app/src/main/java/com/polpg/eventreminder/EventModel.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import com.google.auto.value.AutoValue;
 
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/EventRepository.java b/app/src/main/java/com/polpg/eventreminder/EventRepository.java
similarity index 95%
rename from app/src/main/java/cat/polpadilla/eventreminder/EventRepository.java
rename to app/src/main/java/com/polpg/eventreminder/EventRepository.java
index 89b684a..067e011 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/EventRepository.java
+++ b/app/src/main/java/com/polpg/eventreminder/EventRepository.java
@@ -1,9 +1,8 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.content.Context;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
 
 public class EventRepository {
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/HomeFragment.java b/app/src/main/java/com/polpg/eventreminder/HomeFragment.java
similarity index 96%
rename from app/src/main/java/cat/polpadilla/eventreminder/HomeFragment.java
rename to app/src/main/java/com/polpg/eventreminder/HomeFragment.java
index 9b4eb42..b6834f1 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/HomeFragment.java
+++ b/app/src/main/java/com/polpg/eventreminder/HomeFragment.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -26,9 +26,9 @@
 import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import cat.polpadilla.eventreminder.calendarDecorators.EventDecorator;
-import cat.polpadilla.eventreminder.calendarDecorators.SelectorDecorator;
-import cat.polpadilla.eventreminder.calendarDecorators.TodayDecorator;
+import com.polpg.eventreminder.calendarDecorators.EventDecorator;
+import com.polpg.eventreminder.calendarDecorators.SelectorDecorator;
+import com.polpg.eventreminder.calendarDecorators.TodayDecorator;
 import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
 
 public class HomeFragment extends Fragment {
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/MainActivity.java b/app/src/main/java/com/polpg/eventreminder/MainActivity.java
similarity index 98%
rename from app/src/main/java/cat/polpadilla/eventreminder/MainActivity.java
rename to app/src/main/java/com/polpg/eventreminder/MainActivity.java
index b0a8f48..255b38c 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/MainActivity.java
+++ b/app/src/main/java/com/polpg/eventreminder/MainActivity.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.os.Bundle;
 import android.view.inputmethod.InputMethodManager;
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/Result.java b/app/src/main/java/com/polpg/eventreminder/Result.java
similarity index 97%
rename from app/src/main/java/cat/polpadilla/eventreminder/Result.java
rename to app/src/main/java/com/polpg/eventreminder/Result.java
index edd2013..b38a9bc 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/Result.java
+++ b/app/src/main/java/com/polpg/eventreminder/Result.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import com.google.auto.value.AutoValue;
 
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/RosterListAdapter.java b/app/src/main/java/com/polpg/eventreminder/RosterListAdapter.java
similarity index 91%
rename from app/src/main/java/cat/polpadilla/eventreminder/RosterListAdapter.java
rename to app/src/main/java/com/polpg/eventreminder/RosterListAdapter.java
index 9a768a5..9fccbdf 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/RosterListAdapter.java
+++ b/app/src/main/java/com/polpg/eventreminder/RosterListAdapter.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.view.ViewGroup;
 
@@ -6,7 +6,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import cat.polpadilla.eventreminder.databinding.EventRowBinding;
+import com.polpg.eventreminder.databinding.EventRowBinding;
 
 public class RosterListAdapter extends RecyclerView.Adapter<RosterRowHolder> {
     private List<EventModel> models;
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/RosterRowHolder.java b/app/src/main/java/com/polpg/eventreminder/RosterRowHolder.java
similarity index 86%
rename from app/src/main/java/cat/polpadilla/eventreminder/RosterRowHolder.java
rename to app/src/main/java/com/polpg/eventreminder/RosterRowHolder.java
index 90f66e2..991db05 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/RosterRowHolder.java
+++ b/app/src/main/java/com/polpg/eventreminder/RosterRowHolder.java
@@ -1,11 +1,9 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import androidx.recyclerview.widget.RecyclerView;
 import android.text.format.DateUtils;
 
-import java.util.Calendar;
-
-import cat.polpadilla.eventreminder.databinding.EventRowBinding;
+import com.polpg.eventreminder.databinding.EventRowBinding;
 
 public class RosterRowHolder extends RecyclerView.ViewHolder {
     final private EventRowBinding binding;
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/RosterViewModel.java b/app/src/main/java/com/polpg/eventreminder/RosterViewModel.java
similarity index 98%
rename from app/src/main/java/cat/polpadilla/eventreminder/RosterViewModel.java
rename to app/src/main/java/com/polpg/eventreminder/RosterViewModel.java
index dfc3b84..3485e2b 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/RosterViewModel.java
+++ b/app/src/main/java/com/polpg/eventreminder/RosterViewModel.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.app.Application;
 
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/TimePickerFragment.java b/app/src/main/java/com/polpg/eventreminder/TimePickerFragment.java
similarity index 95%
rename from app/src/main/java/cat/polpadilla/eventreminder/TimePickerFragment.java
rename to app/src/main/java/com/polpg/eventreminder/TimePickerFragment.java
index f3a9b80..b055304 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/TimePickerFragment.java
+++ b/app/src/main/java/com/polpg/eventreminder/TimePickerFragment.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import android.app.Dialog;
 import android.app.TimePickerDialog;
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/TypeTransmogrifier.java b/app/src/main/java/com/polpg/eventreminder/TypeTransmogrifier.java
similarity index 96%
rename from app/src/main/java/cat/polpadilla/eventreminder/TypeTransmogrifier.java
rename to app/src/main/java/com/polpg/eventreminder/TypeTransmogrifier.java
index cd9d229..326646e 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/TypeTransmogrifier.java
+++ b/app/src/main/java/com/polpg/eventreminder/TypeTransmogrifier.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import org.threeten.bp.Instant;
 import org.threeten.bp.LocalDate;
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/ViewState.java b/app/src/main/java/com/polpg/eventreminder/ViewState.java
similarity index 98%
rename from app/src/main/java/cat/polpadilla/eventreminder/ViewState.java
rename to app/src/main/java/com/polpg/eventreminder/ViewState.java
index 6f7a3b6..d0faeee 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/ViewState.java
+++ b/app/src/main/java/com/polpg/eventreminder/ViewState.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import com.google.auto.value.AutoValue;
 import com.google.auto.value.extension.memoized.Memoized;
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/calendarDecorators/EventDecorator.java b/app/src/main/java/com/polpg/eventreminder/calendarDecorators/EventDecorator.java
similarity index 93%
rename from app/src/main/java/cat/polpadilla/eventreminder/calendarDecorators/EventDecorator.java
rename to app/src/main/java/com/polpg/eventreminder/calendarDecorators/EventDecorator.java
index ed96bcf..a214b90 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/calendarDecorators/EventDecorator.java
+++ b/app/src/main/java/com/polpg/eventreminder/calendarDecorators/EventDecorator.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder.calendarDecorators;
+package com.polpg.eventreminder.calendarDecorators;
 
 import com.prolificinteractive.materialcalendarview.CalendarDay;
 import com.prolificinteractive.materialcalendarview.DayViewDecorator;
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/calendarDecorators/SelectorDecorator.java b/app/src/main/java/com/polpg/eventreminder/calendarDecorators/SelectorDecorator.java
similarity index 89%
rename from app/src/main/java/cat/polpadilla/eventreminder/calendarDecorators/SelectorDecorator.java
rename to app/src/main/java/com/polpg/eventreminder/calendarDecorators/SelectorDecorator.java
index bd02632..8a3e8be 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/calendarDecorators/SelectorDecorator.java
+++ b/app/src/main/java/com/polpg/eventreminder/calendarDecorators/SelectorDecorator.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder.calendarDecorators;
+package com.polpg.eventreminder.calendarDecorators;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -8,7 +8,7 @@
 import com.prolificinteractive.materialcalendarview.DayViewFacade;
 
 import androidx.core.content.ContextCompat;
-import cat.polpadilla.eventreminder.R;
+import com.polpg.eventreminder.R;
 
 public class SelectorDecorator implements DayViewDecorator {
 
diff --git a/app/src/main/java/cat/polpadilla/eventreminder/calendarDecorators/TodayDecorator.java b/app/src/main/java/com/polpg/eventreminder/calendarDecorators/TodayDecorator.java
similarity index 95%
rename from app/src/main/java/cat/polpadilla/eventreminder/calendarDecorators/TodayDecorator.java
rename to app/src/main/java/com/polpg/eventreminder/calendarDecorators/TodayDecorator.java
index cee7744..7242b0e 100644
--- a/app/src/main/java/cat/polpadilla/eventreminder/calendarDecorators/TodayDecorator.java
+++ b/app/src/main/java/com/polpg/eventreminder/calendarDecorators/TodayDecorator.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder.calendarDecorators;
+package com.polpg.eventreminder.calendarDecorators;
 
 import android.content.Context;
 import android.graphics.Typeface;
diff --git a/app/src/main/res/layout/event_display.xml b/app/src/main/res/layout/event_display.xml
index ecd5f07..5083fa5 100644
--- a/app/src/main/res/layout/event_display.xml
+++ b/app/src/main/res/layout/event_display.xml
@@ -6,7 +6,7 @@
 
         <variable
             name="model"
-            type="cat.polpadilla.eventreminder.EventModel"/>
+            type="com.polpg.eventreminder.EventModel"/>
 
         <variable
             name="dueDate"
diff --git a/app/src/main/res/layout/event_edit.xml b/app/src/main/res/layout/event_edit.xml
index 2af0b8c..c33037f 100644
--- a/app/src/main/res/layout/event_edit.xml
+++ b/app/src/main/res/layout/event_edit.xml
@@ -5,7 +5,7 @@
     <data>
         <variable
             name="model"
-            type="cat.polpadilla.eventreminder.EventModel"/>
+            type="com.polpg.eventreminder.EventModel"/>
 
         <variable
             name="dueDate"
diff --git a/app/src/main/res/layout/event_row.xml b/app/src/main/res/layout/event_row.xml
index b3ccf83..b56bae1 100644
--- a/app/src/main/res/layout/event_row.xml
+++ b/app/src/main/res/layout/event_row.xml
@@ -7,11 +7,11 @@
 
         <variable
             name="model"
-            type="cat.polpadilla.eventreminder.EventModel"/>
+            type="com.polpg.eventreminder.EventModel"/>
 
         <variable
             name="holder"
-            type="cat.polpadilla.eventreminder.RosterRowHolder"/>
+            type="com.polpg.eventreminder.RosterRowHolder"/>
 
         <variable
             name="dueDate"
diff --git a/app/src/test/java/cat/polpadilla/eventreminder/ExampleUnitTest.java b/app/src/test/java/com/polpg/eventreminder/ExampleUnitTest.java
similarity index 90%
rename from app/src/test/java/cat/polpadilla/eventreminder/ExampleUnitTest.java
rename to app/src/test/java/com/polpg/eventreminder/ExampleUnitTest.java
index 408d4d8..33427b5 100644
--- a/app/src/test/java/cat/polpadilla/eventreminder/ExampleUnitTest.java
+++ b/app/src/test/java/com/polpg/eventreminder/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package cat.polpadilla.eventreminder;
+package com.polpg.eventreminder;
 
 import org.junit.Test;