diff --git a/Riot/ViewController/MasterTabBarController.m b/Riot/ViewController/MasterTabBarController.m
index 31d4605ff..fb3458f33 100644
--- a/Riot/ViewController/MasterTabBarController.m
+++ b/Riot/ViewController/MasterTabBarController.m
@@ -148,7 +148,7 @@
         // (Check whether 'enableCrashReport' flag has been set once)
         if (![[NSUserDefaults standardUserDefaults] objectForKey:@"enableCrashReport"])
         {
-            [self promptUserBeforeUsingGoogleAnalytics];
+            [self promptUserBeforeUsingAnalytics];
         }
         
         [self refreshTabBarBadges];
@@ -771,7 +771,7 @@
 
 #pragma mark -
 
-- (void)promptUserBeforeUsingGoogleAnalytics
+- (void)promptUserBeforeUsingAnalytics
 {
     NSLog(@"[MasterTabBarController]: Invite the user to send crash reports");
     
@@ -815,7 +815,7 @@
                                                        
                                                    }]];
     
-    [currentAlert mxk_setAccessibilityIdentifier: @"HomeVCUseGoogleAnalyticsAlert"];
+    [currentAlert mxk_setAccessibilityIdentifier: @"HomeVCUseAnalyticsAlert"];
     [self presentViewController:currentAlert animated:YES completion:nil];
 }
 
diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m
index ee3685927..7385bb0d2 100644
--- a/Riot/ViewController/SettingsViewController.m
+++ b/Riot/ViewController/SettingsViewController.m
@@ -2850,7 +2850,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
     BOOL enable = [[NSUserDefaults standardUserDefaults] boolForKey:@"enableCrashReport"];
     if (enable)
     {
-        NSLog(@"[SettingsViewController] disable automatic crash report sending");
+        NSLog(@"[SettingsViewController] disable automatic crash report and analytics sending");
         [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"enableCrashReport"];
         [[NSUserDefaults standardUserDefaults] synchronize];
         
@@ -2861,7 +2861,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
     }
     else
     {
-        NSLog(@"[SettingsViewController] enable automatic crash report sending");
+        NSLog(@"[SettingsViewController] enable automatic crash report and analytics sending");
         [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"enableCrashReport"];
         [[NSUserDefaults standardUserDefaults] synchronize];
         
diff --git a/Riot/third_party_licenses.html b/Riot/third_party_licenses.html
index 13163b0d5..b1f0e155b 100644
--- a/Riot/third_party_licenses.html
+++ b/Riot/third_party_licenses.html
@@ -114,19 +114,6 @@
             OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <br/><br/>
     </li>
-    <li>
-        <b>GoogleAnalytics</b> (<a
-            href="https://www.google.com/analytics">https://www.google.com/analytics</a>)
-        <br/><br/>Measure your app performance.
-        <br/><br/>Copyright (c) 2011-2016 Google Inc. All rights reserved.
-        <br/><br/>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License at:
-        <br/><br/><a
-            href="https://www.apache.org/licenses/LICENSE-2.0">https://www.apache.org/licenses/LICENSE-2.0</a>
-        <br/><br/>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.
-        <br/><br/>Google Analytics Terms of Service: <a
-            href="https://www.google.com/analytics/terms">https://www.google.com/analytics/terms</a>
-        <br/><br/>
-    </li>
     <li>
         <b>GZIP</b> (<a
             href="https://github.com/nicklockwood/GZIP">https://github.com/nicklockwood/GZIP</a>)