From 8527008e6e33ec07a86fc9e70d562456e9b8faa5 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Tue, 15 Sep 2015 17:41:07 +0200
Subject: [PATCH] Name cleanup

---
 Android.mk                                    |  2 +-
 README.md                                     |  2 +-
 extern/UnifiedNlpApi                          |  2 +-
 unifiednlp-app/build.gradle                   | 30 ++++++++--------
 unifiednlp-app/src/main/AndroidManifest.xml   |  2 +-
 .../nlp/ui/SettingsLauncherActivity.java      |  2 +-
 unifiednlp-base/build.gradle                  | 34 +++++++++----------
 unifiednlp-base/src/main/AndroidManifest.xml  |  2 +-
 .../org/microg/nlp/AbstractBackendHelper.java |  2 +-
 .../microg/nlp/AbstractProviderService.java   |  2 +-
 .../java/org/microg/nlp/PackageReceiver.java  |  2 +-
 .../main/java/org/microg/nlp/Preferences.java |  2 +-
 .../main/java/org/microg/nlp/Provider.java    |  2 +-
 .../nlp/geocode/AbstractGeocodeService.java   |  2 +-
 .../org/microg/nlp/geocode/BackendFuser.java  |  2 +-
 .../org/microg/nlp/geocode/BackendHelper.java |  2 +-
 .../microg/nlp/geocode/GeocodeProvider.java   |  2 +-
 .../microg/nlp/geocode/GeocodeProviderV1.java |  2 +-
 .../microg/nlp/geocode/GeocodeServiceV1.java  |  2 +-
 .../nlp/location/AbstractLocationService.java |  2 +-
 .../org/microg/nlp/location/BackendFuser.java |  2 +-
 .../microg/nlp/location/BackendHelper.java    |  2 +-
 .../microg/nlp/location/LocationProvider.java |  2 +-
 .../nlp/location/LocationProviderV1.java      |  2 +-
 .../nlp/location/LocationProviderV2.java      |  2 +-
 .../nlp/location/LocationServiceV1.java       |  2 +-
 .../nlp/location/LocationServiceV2.java       |  2 +-
 .../org/microg/nlp/location/ThreadHelper.java |  2 +-
 .../nlp/ui/AbstractBackendPreference.java     |  2 +-
 .../nlp/ui/GeocoderBackendPreference.java     |  2 +-
 .../nlp/ui/LocationBackendPreference.java     |  2 +-
 .../microg/nlp/ui/SettingInjectorService.java |  2 +-
 .../org/microg/nlp/ui/SettingsActivity.java   |  2 +-
 .../main/res/layout/backend_list_entry.xml    |  2 +-
 .../src/main/res/layout/settings_activity.xml |  2 +-
 .../src/main/res/layout/toolbar.xml           |  2 +-
 .../src/main/res/values-sr/strings.xml        |  6 ++--
 .../src/main/res/values/colors.xml            |  2 +-
 .../src/main/res/values/strings.xml           |  6 ++--
 .../src/main/res/values/themes.xml            |  2 +-
 .../src/main/res/xml/nlp_injected_setting.xml |  2 +-
 .../src/main/res/xml/nlp_preferences.xml      |  2 +-
 unifiednlp-compat/build.gradle                | 26 +++++++-------
 43 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/Android.mk b/Android.mk
index 4b0fda8..d5969f7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (c) 2014 μg Project
+# Copyright (c) 2013-2015 microG Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index a75fc73..2aa7fdb 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ Some components: Copyright (C) 2013 The Android Open Source Project
 
 License
 -------
-    Copyright 2014 μg Project Team
+    Copyright 2013-2015 microG Project Team
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/extern/UnifiedNlpApi b/extern/UnifiedNlpApi
index 8b2a8eb..236ef06 160000
--- a/extern/UnifiedNlpApi
+++ b/extern/UnifiedNlpApi
@@ -1 +1 @@
-Subproject commit 8b2a8eb21488fea4df0273ef9f369ac5f764bad2
+Subproject commit 236ef064e1293664f4a7dee9fbd0365ee6787ae7
diff --git a/unifiednlp-app/build.gradle b/unifiednlp-app/build.gradle
index 4f0a791..756db4b 100644
--- a/unifiednlp-app/build.gradle
+++ b/unifiednlp-app/build.gradle
@@ -1,17 +1,17 @@
 /*
- Copyright 2013-2015 µg Project Team
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ * Copyright 2013-2015 microG Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 buildscript {
@@ -26,8 +26,8 @@ buildscript {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     productFlavors {
         NetworkLocation {
diff --git a/unifiednlp-app/src/main/AndroidManifest.xml b/unifiednlp-app/src/main/AndroidManifest.xml
index 998329a..e3d3ad6 100644
--- a/unifiednlp-app/src/main/AndroidManifest.xml
+++ b/unifiednlp-app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/unifiednlp-app/src/main/java/org/microg/nlp/ui/SettingsLauncherActivity.java b/unifiednlp-app/src/main/java/org/microg/nlp/ui/SettingsLauncherActivity.java
index f5a8dd8..94d51fc 100644
--- a/unifiednlp-app/src/main/java/org/microg/nlp/ui/SettingsLauncherActivity.java
+++ b/unifiednlp-app/src/main/java/org/microg/nlp/ui/SettingsLauncherActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/build.gradle b/unifiednlp-base/build.gradle
index e3a7448..0f42b2b 100644
--- a/unifiednlp-base/build.gradle
+++ b/unifiednlp-base/build.gradle
@@ -1,17 +1,17 @@
 /*
- Copyright 2013-2015 µg Project Team
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ * Copyright 2013-2015 microG Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 buildscript {
@@ -26,16 +26,16 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_6
     }
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:22.2.0'
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:support-v4:23.0.1'
+    compile 'com.android.support:appcompat-v7:23.0.1'
     compile project(':unifiednlp-api')
     provided project(':unifiednlp-compat')
 }
\ No newline at end of file
diff --git a/unifiednlp-base/src/main/AndroidManifest.xml b/unifiednlp-base/src/main/AndroidManifest.xml
index f765f56..69d208e 100644
--- a/unifiednlp-base/src/main/AndroidManifest.xml
+++ b/unifiednlp-base/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/AbstractBackendHelper.java b/unifiednlp-base/src/main/java/org/microg/nlp/AbstractBackendHelper.java
index aebd042..80afe8b 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/AbstractBackendHelper.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/AbstractBackendHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/AbstractProviderService.java b/unifiednlp-base/src/main/java/org/microg/nlp/AbstractProviderService.java
index c5cd7aa..663bd14 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/AbstractProviderService.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/AbstractProviderService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/PackageReceiver.java b/unifiednlp-base/src/main/java/org/microg/nlp/PackageReceiver.java
index de165d7..d5be49d 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/PackageReceiver.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/PackageReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/Preferences.java b/unifiednlp-base/src/main/java/org/microg/nlp/Preferences.java
index 20c837e..a80aa12 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/Preferences.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/Preferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/Provider.java b/unifiednlp-base/src/main/java/org/microg/nlp/Provider.java
index 80987b9..42fd2f1 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/Provider.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/Provider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/AbstractGeocodeService.java b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/AbstractGeocodeService.java
index d5e40e0..6e9fb49 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/AbstractGeocodeService.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/AbstractGeocodeService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendFuser.java b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendFuser.java
index 37b53ce..4b1e6d9 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendFuser.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendFuser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendHelper.java b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendHelper.java
index 8557492..6eefaa1 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendHelper.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProvider.java b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProvider.java
index fa57765..1f016fc 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProvider.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProviderV1.java b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProviderV1.java
index 84c2d20..7b7d2d4 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProviderV1.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProviderV1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeServiceV1.java b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeServiceV1.java
index ee29a28..79df8a1 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeServiceV1.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeServiceV1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/location/AbstractLocationService.java b/unifiednlp-base/src/main/java/org/microg/nlp/location/AbstractLocationService.java
index 965e467..639f2bc 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/AbstractLocationService.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/AbstractLocationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendFuser.java b/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendFuser.java
index 3ead286..63a2b09 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendFuser.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendFuser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendHelper.java b/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendHelper.java
index 2f49119..e2fef8c 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendHelper.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProvider.java b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProvider.java
index 336594f..3e6f929 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProvider.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV1.java b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV1.java
index 652a89a..0b5138e 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV1.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV2.java b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV2.java
index a9fbd32..465b68a 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV2.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV1.java b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV1.java
index 64babf9..430b966 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV1.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV2.java b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV2.java
index 581265b..54aa1c1 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV2.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/location/ThreadHelper.java b/unifiednlp-base/src/main/java/org/microg/nlp/location/ThreadHelper.java
index 7549316..d195499 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/ThreadHelper.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/ThreadHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/ui/AbstractBackendPreference.java b/unifiednlp-base/src/main/java/org/microg/nlp/ui/AbstractBackendPreference.java
index 0938cad..68294fa 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/ui/AbstractBackendPreference.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/ui/AbstractBackendPreference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/ui/GeocoderBackendPreference.java b/unifiednlp-base/src/main/java/org/microg/nlp/ui/GeocoderBackendPreference.java
index eb55c09..66b690f 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/ui/GeocoderBackendPreference.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/ui/GeocoderBackendPreference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/ui/LocationBackendPreference.java b/unifiednlp-base/src/main/java/org/microg/nlp/ui/LocationBackendPreference.java
index 50ebaef..ed62a3c 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/ui/LocationBackendPreference.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/ui/LocationBackendPreference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingInjectorService.java b/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingInjectorService.java
index e89149e..5a35fc4 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingInjectorService.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingInjectorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingsActivity.java b/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingsActivity.java
index ec8f2ef..5ca4343 100644
--- a/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingsActivity.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/res/layout/backend_list_entry.xml b/unifiednlp-base/src/main/res/layout/backend_list_entry.xml
index 0e91e16..85fe4b9 100644
--- a/unifiednlp-base/src/main/res/layout/backend_list_entry.xml
+++ b/unifiednlp-base/src/main/res/layout/backend_list_entry.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/res/layout/settings_activity.xml b/unifiednlp-base/src/main/res/layout/settings_activity.xml
index 3d5801c..5b5ab67 100644
--- a/unifiednlp-base/src/main/res/layout/settings_activity.xml
+++ b/unifiednlp-base/src/main/res/layout/settings_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/res/layout/toolbar.xml b/unifiednlp-base/src/main/res/layout/toolbar.xml
index 2a2e173..7a11e1a 100644
--- a/unifiednlp-base/src/main/res/layout/toolbar.xml
+++ b/unifiednlp-base/src/main/res/layout/toolbar.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/res/values-sr/strings.xml b/unifiednlp-base/src/main/res/values-sr/strings.xml
index e6a8fae..9000947 100644
--- a/unifiednlp-base/src/main/res/values-sr/strings.xml
+++ b/unifiednlp-base/src/main/res/values-sr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
   -->
 
 <resources>
-    <string name="nlp_app_name">µg ОбједињениNlp</string>
-    <string name="nlp_settings_label">µg ОбједињениNlp поставке</string>
+    <string name="nlp_app_name">ОбједињениNlp</string>
+    <string name="nlp_settings_label">ОбједињениNlp поставке</string>
     <string name="add_backend">Додај мотор</string>
     <string name="configure_location_backends">Поставке мотора за локацију</string>
     <string name="configure_geocoder_backends">Поставке мотора за потрагу адреса</string>
diff --git a/unifiednlp-base/src/main/res/values/colors.xml b/unifiednlp-base/src/main/res/values/colors.xml
index a065f2c..111cc29 100644
--- a/unifiednlp-base/src/main/res/values/colors.xml
+++ b/unifiednlp-base/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/res/values/strings.xml b/unifiednlp-base/src/main/res/values/strings.xml
index 4228d1d..f544e22 100644
--- a/unifiednlp-base/src/main/res/values/strings.xml
+++ b/unifiednlp-base/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
   -->
 
 <resources>
-    <string name="nlp_app_name">µg UnifiedNlp</string>
-    <string name="nlp_settings_label">µg UnifiedNlp Settings</string>
+    <string name="nlp_app_name">UnifiedNlp</string>
+    <string name="nlp_settings_label">UnifiedNlp Settings</string>
     <string name="add_backend">Add backend</string>
     <string name="configure_location_backends">Configure location backends</string>
     <string name="configure_geocoder_backends">Configure address lookup backends</string>
diff --git a/unifiednlp-base/src/main/res/values/themes.xml b/unifiednlp-base/src/main/res/values/themes.xml
index f942b01..76e2a0b 100644
--- a/unifiednlp-base/src/main/res/values/themes.xml
+++ b/unifiednlp-base/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/res/xml/nlp_injected_setting.xml b/unifiednlp-base/src/main/res/xml/nlp_injected_setting.xml
index 6f42249..573faec 100644
--- a/unifiednlp-base/src/main/res/xml/nlp_injected_setting.xml
+++ b/unifiednlp-base/src/main/res/xml/nlp_injected_setting.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/unifiednlp-base/src/main/res/xml/nlp_preferences.xml b/unifiednlp-base/src/main/res/xml/nlp_preferences.xml
index ecdf52b..62e18d2 100644
--- a/unifiednlp-base/src/main/res/xml/nlp_preferences.xml
+++ b/unifiednlp-base/src/main/res/xml/nlp_preferences.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/unifiednlp-compat/build.gradle b/unifiednlp-compat/build.gradle
index c71013b..08dd2ec 100644
--- a/unifiednlp-compat/build.gradle
+++ b/unifiednlp-compat/build.gradle
@@ -1,17 +1,17 @@
 /*
- Copyright 2013-2015 µg Project Team
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ * Copyright 2013-2015 microG Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 apply plugin: 'java'