Merge changes I2f42d5a3,I99c99292 into mnc-dev

* changes:
  Rename ActiveNotification to ActiveNotifications
  Rename 'AutomaticBackup' to 'AutoBackupForApps'
diff --git a/content/AutomaticBackup/Application/.gitignore b/content/AutoBackupForApps/Application/.gitignore
similarity index 100%
rename from content/AutomaticBackup/Application/.gitignore
rename to content/AutoBackupForApps/Application/.gitignore
diff --git a/content/AutomaticBackup/Application/proguard-project.txt b/content/AutoBackupForApps/Application/proguard-project.txt
similarity index 100%
rename from content/AutomaticBackup/Application/proguard-project.txt
rename to content/AutoBackupForApps/Application/proguard-project.txt
diff --git a/content/AutomaticBackup/Application/src/main/AndroidManifest.xml b/content/AutoBackupForApps/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/AndroidManifest.xml
rename to content/AutoBackupForApps/Application/src/main/AndroidManifest.xml
diff --git a/content/AutomaticBackup/Application/src/main/java/com/example/android/autobackupsample/AddFileActivity.java b/content/AutoBackupForApps/Application/src/main/java/com/example/android/autobackupsample/AddFileActivity.java
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/java/com/example/android/autobackupsample/AddFileActivity.java
rename to content/AutoBackupForApps/Application/src/main/java/com/example/android/autobackupsample/AddFileActivity.java
diff --git a/content/AutomaticBackup/Application/src/main/java/com/example/android/autobackupsample/MainActivity.java b/content/AutoBackupForApps/Application/src/main/java/com/example/android/autobackupsample/MainActivity.java
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/java/com/example/android/autobackupsample/MainActivity.java
rename to content/AutoBackupForApps/Application/src/main/java/com/example/android/autobackupsample/MainActivity.java
diff --git a/content/AutomaticBackup/Application/src/main/java/com/example/android/autobackupsample/MainActivityFragment.java b/content/AutoBackupForApps/Application/src/main/java/com/example/android/autobackupsample/MainActivityFragment.java
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/java/com/example/android/autobackupsample/MainActivityFragment.java
rename to content/AutoBackupForApps/Application/src/main/java/com/example/android/autobackupsample/MainActivityFragment.java
diff --git a/content/AutomaticBackup/Application/src/main/java/com/example/android/autobackupsample/Utils.java b/content/AutoBackupForApps/Application/src/main/java/com/example/android/autobackupsample/Utils.java
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/java/com/example/android/autobackupsample/Utils.java
rename to content/AutoBackupForApps/Application/src/main/java/com/example/android/autobackupsample/Utils.java
diff --git a/content/AutomaticBackup/Application/src/main/res/layout/activity_main.xml b/content/AutoBackupForApps/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/layout/activity_main.xml
rename to content/AutoBackupForApps/Application/src/main/res/layout/activity_main.xml
diff --git a/content/AutomaticBackup/Application/src/main/res/layout/add_file.xml b/content/AutoBackupForApps/Application/src/main/res/layout/add_file.xml
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/layout/add_file.xml
rename to content/AutoBackupForApps/Application/src/main/res/layout/add_file.xml
diff --git a/content/AutomaticBackup/Application/src/main/res/layout/file_list_item.xml b/content/AutoBackupForApps/Application/src/main/res/layout/file_list_item.xml
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/layout/file_list_item.xml
rename to content/AutoBackupForApps/Application/src/main/res/layout/file_list_item.xml
diff --git a/content/AutomaticBackup/Application/src/main/res/layout/fragment_main.xml b/content/AutoBackupForApps/Application/src/main/res/layout/fragment_main.xml
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/layout/fragment_main.xml
rename to content/AutoBackupForApps/Application/src/main/res/layout/fragment_main.xml
diff --git a/content/AutomaticBackup/Application/src/main/res/menu/menu_main.xml b/content/AutoBackupForApps/Application/src/main/res/menu/menu_main.xml
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/menu/menu_main.xml
rename to content/AutoBackupForApps/Application/src/main/res/menu/menu_main.xml
diff --git a/content/AutomaticBackup/Application/src/main/res/mipmap-hdpi/ic_launcher.png b/content/AutoBackupForApps/Application/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/mipmap-hdpi/ic_launcher.png
rename to content/AutoBackupForApps/Application/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/content/AutomaticBackup/Application/src/main/res/mipmap-mdpi/ic_launcher.png b/content/AutoBackupForApps/Application/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/mipmap-mdpi/ic_launcher.png
rename to content/AutoBackupForApps/Application/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/content/AutomaticBackup/Application/src/main/res/mipmap-xhdpi/ic_launcher.png b/content/AutoBackupForApps/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to content/AutoBackupForApps/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/content/AutomaticBackup/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png b/content/AutoBackupForApps/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to content/AutoBackupForApps/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/content/AutomaticBackup/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/content/AutoBackupForApps/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to content/AutoBackupForApps/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/content/AutomaticBackup/Application/src/main/res/values-w820dp/dimens.xml b/content/AutoBackupForApps/Application/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/values-w820dp/dimens.xml
rename to content/AutoBackupForApps/Application/src/main/res/values-w820dp/dimens.xml
diff --git a/content/AutomaticBackup/Application/src/main/res/values/dimens.xml b/content/AutoBackupForApps/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/values/dimens.xml
rename to content/AutoBackupForApps/Application/src/main/res/values/dimens.xml
diff --git a/content/AutomaticBackup/Application/src/main/res/values/strings.xml b/content/AutoBackupForApps/Application/src/main/res/values/strings.xml
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/values/strings.xml
rename to content/AutoBackupForApps/Application/src/main/res/values/strings.xml
diff --git a/content/AutomaticBackup/Application/src/main/res/xml/backup.xml b/content/AutoBackupForApps/Application/src/main/res/xml/backup.xml
similarity index 100%
rename from content/AutomaticBackup/Application/src/main/res/xml/backup.xml
rename to content/AutoBackupForApps/Application/src/main/res/xml/backup.xml
diff --git a/content/AutomaticBackup/build.gradle b/content/AutoBackupForApps/build.gradle
similarity index 100%
rename from content/AutomaticBackup/build.gradle
rename to content/AutoBackupForApps/build.gradle
diff --git a/content/AutomaticBackup/buildSrc/build.gradle b/content/AutoBackupForApps/buildSrc/build.gradle
similarity index 100%
rename from content/AutomaticBackup/buildSrc/build.gradle
rename to content/AutoBackupForApps/buildSrc/build.gradle
diff --git a/content/AutomaticBackup/gradle/wrapper/gradle-wrapper.jar b/content/AutoBackupForApps/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from content/AutomaticBackup/gradle/wrapper/gradle-wrapper.jar
rename to content/AutoBackupForApps/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/content/AutomaticBackup/gradle/wrapper/gradle-wrapper.properties b/content/AutoBackupForApps/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from content/AutomaticBackup/gradle/wrapper/gradle-wrapper.properties
rename to content/AutoBackupForApps/gradle/wrapper/gradle-wrapper.properties
diff --git a/content/AutomaticBackup/gradlew b/content/AutoBackupForApps/gradlew
similarity index 100%
rename from content/AutomaticBackup/gradlew
rename to content/AutoBackupForApps/gradlew
diff --git a/content/AutomaticBackup/gradlew.bat b/content/AutoBackupForApps/gradlew.bat
similarity index 100%
rename from content/AutomaticBackup/gradlew.bat
rename to content/AutoBackupForApps/gradlew.bat
diff --git a/content/AutomaticBackup/screenshots/ic_launcher.png b/content/AutoBackupForApps/screenshots/ic_launcher.png
similarity index 100%
rename from content/AutomaticBackup/screenshots/ic_launcher.png
rename to content/AutoBackupForApps/screenshots/ic_launcher.png
Binary files differ
diff --git a/content/AutomaticBackup/screenshots/main.png b/content/AutoBackupForApps/screenshots/main.png
similarity index 100%
rename from content/AutomaticBackup/screenshots/main.png
rename to content/AutoBackupForApps/screenshots/main.png
Binary files differ
diff --git a/content/AutomaticBackup/settings.gradle b/content/AutoBackupForApps/settings.gradle
similarity index 100%
rename from content/AutomaticBackup/settings.gradle
rename to content/AutoBackupForApps/settings.gradle
diff --git a/content/AutomaticBackup/template-params.xml b/content/AutoBackupForApps/template-params.xml
similarity index 100%
rename from content/AutomaticBackup/template-params.xml
rename to content/AutoBackupForApps/template-params.xml
diff --git a/notification/ActiveNotification/Application/.gitignore b/notification/ActiveNotifications/Application/.gitignore
similarity index 100%
rename from notification/ActiveNotification/Application/.gitignore
rename to notification/ActiveNotifications/Application/.gitignore
diff --git a/notification/ActiveNotification/Application/README-fragmentview.txt b/notification/ActiveNotifications/Application/README-fragmentview.txt
similarity index 100%
rename from notification/ActiveNotification/Application/README-fragmentview.txt
rename to notification/ActiveNotifications/Application/README-fragmentview.txt
diff --git a/notification/ActiveNotification/Application/README-singleview.txt b/notification/ActiveNotifications/Application/README-singleview.txt
similarity index 100%
rename from notification/ActiveNotification/Application/README-singleview.txt
rename to notification/ActiveNotifications/Application/README-singleview.txt
diff --git a/notification/ActiveNotification/Application/proguard-project.txt b/notification/ActiveNotifications/Application/proguard-project.txt
similarity index 100%
rename from notification/ActiveNotification/Application/proguard-project.txt
rename to notification/ActiveNotifications/Application/proguard-project.txt
diff --git a/notification/ActiveNotification/Application/src/androidTest/java/com/example/android/activenotification/test/SampleTests.java b/notification/ActiveNotifications/Application/src/androidTest/java/com/example/android/activenotifications/test/SampleTests.java
similarity index 95%
rename from notification/ActiveNotification/Application/src/androidTest/java/com/example/android/activenotification/test/SampleTests.java
rename to notification/ActiveNotifications/Application/src/androidTest/java/com/example/android/activenotifications/test/SampleTests.java
index f23b7c5..aaabaf0 100644
--- a/notification/ActiveNotification/Application/src/androidTest/java/com/example/android/activenotification/test/SampleTests.java
+++ b/notification/ActiveNotifications/Application/src/androidTest/java/com/example/android/activenotifications/test/SampleTests.java
@@ -28,9 +28,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.example.android.activenotification.test;
+package com.example.android.activenotifications.test;
 
-import com.example.android.activenotification.*;
+import com.example.android.activenotifications.*;
 
 import android.test.ActivityInstrumentationTestCase2;
 
diff --git a/notification/ActiveNotification/Application/src/main/AndroidManifest.xml b/notification/ActiveNotifications/Application/src/main/AndroidManifest.xml
similarity index 95%
rename from notification/ActiveNotification/Application/src/main/AndroidManifest.xml
rename to notification/ActiveNotifications/Application/src/main/AndroidManifest.xml
index a7110ea..3a39282 100644
--- a/notification/ActiveNotification/Application/src/main/AndroidManifest.xml
+++ b/notification/ActiveNotifications/Application/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.activenotification"
+    package="com.example.android.activenotifications"
     android:versionCode="1"
     android:versionName="1.0">
 
diff --git a/notification/ActiveNotification/Application/src/main/java/com/example/android/activenotification/ActiveNotificationActivity.java b/notification/ActiveNotifications/Application/src/main/java/com/example/android/activenotifications/ActiveNotificationActivity.java
similarity index 94%
rename from notification/ActiveNotification/Application/src/main/java/com/example/android/activenotification/ActiveNotificationActivity.java
rename to notification/ActiveNotifications/Application/src/main/java/com/example/android/activenotifications/ActiveNotificationActivity.java
index 7ac7c8c..bdb5421 100644
--- a/notification/ActiveNotification/Application/src/main/java/com/example/android/activenotification/ActiveNotificationActivity.java
+++ b/notification/ActiveNotifications/Application/src/main/java/com/example/android/activenotifications/ActiveNotificationActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.activenotification;
+package com.example.android.activenotifications;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -28,7 +28,7 @@
     private ActiveNotificationFragment mFragment;
 
     protected static final String ACTION_NOTIFICATION_DELETE
-            = "com.example.android.activenotification.delete";
+            = "com.example.android.activenotifications.delete";
 
     private BroadcastReceiver mDeleteReceiver = new BroadcastReceiver() {
         @Override
diff --git a/notification/ActiveNotification/Application/src/main/java/com/example/android/activenotification/ActiveNotificationFragment.java b/notification/ActiveNotifications/Application/src/main/java/com/example/android/activenotifications/ActiveNotificationFragment.java
similarity index 98%
rename from notification/ActiveNotification/Application/src/main/java/com/example/android/activenotification/ActiveNotificationFragment.java
rename to notification/ActiveNotifications/Application/src/main/java/com/example/android/activenotifications/ActiveNotificationFragment.java
index 0f4fbf1..3e87849 100644
--- a/notification/ActiveNotification/Application/src/main/java/com/example/android/activenotification/ActiveNotificationFragment.java
+++ b/notification/ActiveNotifications/Application/src/main/java/com/example/android/activenotifications/ActiveNotificationFragment.java
@@ -1,4 +1,4 @@
-package com.example.android.activenotification;
+package com.example.android.activenotifications;
 /*
 * Copyright 2015 The Android Open Source Project
 *
diff --git a/notification/ActiveNotification/Application/src/main/res/layout/fragment_notification_builder.xml b/notification/ActiveNotifications/Application/src/main/res/layout/fragment_notification_builder.xml
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/layout/fragment_notification_builder.xml
rename to notification/ActiveNotifications/Application/src/main/res/layout/fragment_notification_builder.xml
diff --git a/notification/ActiveNotification/Application/src/main/res/mipmap-hdpi/ic_launcher.png b/notification/ActiveNotifications/Application/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/mipmap-hdpi/ic_launcher.png
rename to notification/ActiveNotifications/Application/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/notification/ActiveNotification/Application/src/main/res/mipmap-hdpi/ic_notification.png b/notification/ActiveNotifications/Application/src/main/res/mipmap-hdpi/ic_notification.png
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/mipmap-hdpi/ic_notification.png
rename to notification/ActiveNotifications/Application/src/main/res/mipmap-hdpi/ic_notification.png
Binary files differ
diff --git a/notification/ActiveNotification/Application/src/main/res/mipmap-mdpi/ic_launcher.png b/notification/ActiveNotifications/Application/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/mipmap-mdpi/ic_launcher.png
rename to notification/ActiveNotifications/Application/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/notification/ActiveNotification/Application/src/main/res/mipmap-mdpi/ic_notification.png b/notification/ActiveNotifications/Application/src/main/res/mipmap-mdpi/ic_notification.png
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/mipmap-mdpi/ic_notification.png
rename to notification/ActiveNotifications/Application/src/main/res/mipmap-mdpi/ic_notification.png
Binary files differ
diff --git a/notification/ActiveNotification/Application/src/main/res/mipmap-xhdpi/ic_launcher.png b/notification/ActiveNotifications/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to notification/ActiveNotifications/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/notification/ActiveNotification/Application/src/main/res/mipmap-xhdpi/ic_notification.png b/notification/ActiveNotifications/Application/src/main/res/mipmap-xhdpi/ic_notification.png
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/mipmap-xhdpi/ic_notification.png
rename to notification/ActiveNotifications/Application/src/main/res/mipmap-xhdpi/ic_notification.png
Binary files differ
diff --git a/notification/ActiveNotification/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png b/notification/ActiveNotifications/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to notification/ActiveNotifications/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/notification/ActiveNotification/Application/src/main/res/mipmap-xxhdpi/ic_notification.png b/notification/ActiveNotifications/Application/src/main/res/mipmap-xxhdpi/ic_notification.png
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/mipmap-xxhdpi/ic_notification.png
rename to notification/ActiveNotifications/Application/src/main/res/mipmap-xxhdpi/ic_notification.png
Binary files differ
diff --git a/notification/ActiveNotification/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/notification/ActiveNotifications/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to notification/ActiveNotifications/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/notification/ActiveNotification/Application/src/main/res/mipmap-xxxhdpi/ic_notification.png b/notification/ActiveNotifications/Application/src/main/res/mipmap-xxxhdpi/ic_notification.png
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/mipmap-xxxhdpi/ic_notification.png
rename to notification/ActiveNotifications/Application/src/main/res/mipmap-xxxhdpi/ic_notification.png
Binary files differ
diff --git a/notification/ActiveNotification/Application/src/main/res/values/strings.xml b/notification/ActiveNotifications/Application/src/main/res/values/strings.xml
similarity index 100%
rename from notification/ActiveNotification/Application/src/main/res/values/strings.xml
rename to notification/ActiveNotifications/Application/src/main/res/values/strings.xml
diff --git a/notification/ActiveNotification/build.gradle b/notification/ActiveNotifications/build.gradle
similarity index 100%
rename from notification/ActiveNotification/build.gradle
rename to notification/ActiveNotifications/build.gradle
diff --git a/notification/ActiveNotification/buildSrc/build.gradle b/notification/ActiveNotifications/buildSrc/build.gradle
similarity index 100%
rename from notification/ActiveNotification/buildSrc/build.gradle
rename to notification/ActiveNotifications/buildSrc/build.gradle
diff --git a/notification/ActiveNotification/gradle/wrapper/gradle-wrapper.jar b/notification/ActiveNotifications/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from notification/ActiveNotification/gradle/wrapper/gradle-wrapper.jar
rename to notification/ActiveNotifications/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/notification/ActiveNotification/gradle/wrapper/gradle-wrapper.properties b/notification/ActiveNotifications/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from notification/ActiveNotification/gradle/wrapper/gradle-wrapper.properties
rename to notification/ActiveNotifications/gradle/wrapper/gradle-wrapper.properties
diff --git a/notification/ActiveNotification/gradlew b/notification/ActiveNotifications/gradlew
similarity index 100%
rename from notification/ActiveNotification/gradlew
rename to notification/ActiveNotifications/gradlew
diff --git a/notification/ActiveNotification/gradlew.bat b/notification/ActiveNotifications/gradlew.bat
similarity index 100%
rename from notification/ActiveNotification/gradlew.bat
rename to notification/ActiveNotifications/gradlew.bat
diff --git a/notification/ActiveNotification/screenshots/icon_web.png b/notification/ActiveNotifications/screenshots/icon_web.png
similarity index 100%
rename from notification/ActiveNotification/screenshots/icon_web.png
rename to notification/ActiveNotifications/screenshots/icon_web.png
Binary files differ
diff --git a/notification/ActiveNotification/screenshots/screenshot01.png b/notification/ActiveNotifications/screenshots/screenshot01.png
similarity index 100%
rename from notification/ActiveNotification/screenshots/screenshot01.png
rename to notification/ActiveNotifications/screenshots/screenshot01.png
Binary files differ
diff --git a/notification/ActiveNotification/screenshots/screenshot02.png b/notification/ActiveNotifications/screenshots/screenshot02.png
similarity index 100%
rename from notification/ActiveNotification/screenshots/screenshot02.png
rename to notification/ActiveNotifications/screenshots/screenshot02.png
Binary files differ
diff --git a/notification/ActiveNotification/screenshots/screenshot03.png b/notification/ActiveNotifications/screenshots/screenshot03.png
similarity index 100%
rename from notification/ActiveNotification/screenshots/screenshot03.png
rename to notification/ActiveNotifications/screenshots/screenshot03.png
Binary files differ
diff --git a/notification/ActiveNotification/settings.gradle b/notification/ActiveNotifications/settings.gradle
similarity index 100%
rename from notification/ActiveNotification/settings.gradle
rename to notification/ActiveNotifications/settings.gradle
diff --git a/notification/ActiveNotification/template-params.xml b/notification/ActiveNotifications/template-params.xml
similarity index 98%
rename from notification/ActiveNotification/template-params.xml
rename to notification/ActiveNotifications/template-params.xml
index 2ebebbe..e105906 100644
--- a/notification/ActiveNotification/template-params.xml
+++ b/notification/ActiveNotifications/template-params.xml
@@ -18,7 +18,7 @@
     <name>ActiveNotification</name>
     <group>Notification</group>  <!-- This field will be deprecated in the future
                             and replaced with the "categories" tags below. -->
-    <package>com.example.android.activenotification</package>
+    <package>com.example.android.activenotifications</package>
 
     <!-- change minSdk if needed-->
     <minSdk>"android-MNC"</minSdk>