diff --git a/ajax/cache/status.php b/ajax/cache/status.php
index 29bda771..79fcb442 100644
--- a/ajax/cache/status.php
+++ b/ajax/cache/status.php
@@ -14,7 +14,7 @@ foreach($calendars as $calendar) {
 		$allcached = false;
 	}
 }
-$l = new OC_L10N('calendar');
+$l = OCP\Util::getL10N('calendar');
 if(!$allcached) {
 	OCP\JSON::error(array('message'=>'Not all calendars are completely cached', 'l10n'=>$l->t('Not all calendars are completely cached')));
 }else{
diff --git a/ajax/calendar/overview.php b/ajax/calendar/overview.php
index df0354f4..a440ddd2 100644
--- a/ajax/calendar/overview.php
+++ b/ajax/calendar/overview.php
@@ -5,7 +5,7 @@
  * later.
  * See the COPYING-README file.
  */
-$l10n = OC_L10N::get('calendar');
+$l10n = OCP\Util::getL10N('calendar');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 $output = new OCP\Template("calendar", "part.choosecalendar");
diff --git a/ajax/settings/guesstimezone.php b/ajax/settings/guesstimezone.php
index d71ff744..bd7ec23a 100644
--- a/ajax/settings/guesstimezone.php
+++ b/ajax/settings/guesstimezone.php
@@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 OCP\JSON::callCheck();
 
-$l = OC_L10N::get('calendar');
+$l = OCP\Util::getL10N('calendar');
 
 $lat = $_POST['lat'];
 $lng = $_POST['lng'];
diff --git a/ajax/settings/settimezone.php b/ajax/settings/settimezone.php
index 7dbfa518..de57cd17 100644
--- a/ajax/settings/settimezone.php
+++ b/ajax/settings/settimezone.php
@@ -9,7 +9,7 @@
 // Init owncloud
 
 
-$l=OC_L10N::get('calendar');
+$l = OCP\Util::getL10N('calendar');
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
diff --git a/appinfo/app.php b/appinfo/app.php
index 68a20515..26f97950 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -1,5 +1,5 @@
 <?php
-$l=OC_L10N::get('calendar');
+$l = OCP\Util::getL10N('calendar');
 OC::$CLASSPATH['OC_Calendar_App'] = 'calendar/lib/app.php';
 OC::$CLASSPATH['OC_Calendar_Calendar'] = 'calendar/lib/calendar.php';
 OC::$CLASSPATH['OC_Calendar_Object'] = 'calendar/lib/object.php';
diff --git a/appinfo/preupdate.php b/appinfo/preupdate.php
index ff97a71e..d13fd92b 100644
--- a/appinfo/preupdate.php
+++ b/appinfo/preupdate.php
@@ -19,6 +19,6 @@ if (version_compare($installedVersion, '0.6.3', '<')) {
 		$sm->renameTable($prefix.'calendar_share_calendar', $prefix.'clndr_share_calendar');
 		$sm->renameTable($prefix.'calendar_repeat', $prefix.'clndr_repeat');
 	} catch (Exception $e) {
-		OC_Log::write('calendar', 'preupdate: '.$e->getMessage(), OC_Log::ERROR);
+		\OCP\Util::writeLog('calendar', 'preupdate: '.$e->getMessage(), \OCP\Util::ERROR);
 	}
 }
diff --git a/calendar.php b/calendar.php
index 2c0bee9d..9832a56b 100644
--- a/calendar.php
+++ b/calendar.php
@@ -5,7 +5,7 @@
  * later.
  * See the COPYING-README file.
  */
-$l10n = OC_L10N::get('calendar');
+$l10n = OCP\Util::getL10N('calendar');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 $tmpl = new OCP\Template('calendar', 'part.choosecalendar');
diff --git a/js/l10n.php b/js/l10n.php
index 9ed09590..d86d10ca 100644
--- a/js/l10n.php
+++ b/js/l10n.php
@@ -14,7 +14,7 @@ header("Cache-Control: no-cache, must-revalidate");
 header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); 
 
 // Enable l10n support
-$l = OC_L10N::get('calendar');
+$l = OCP\Util::getL10N('calendar');
 
 
 // Get the event sources
diff --git a/lib/app.php b/lib/app.php
index 08754d03..edd31535 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -8,7 +8,7 @@
  *
  * This class manages our app actions
  */
-OC_Calendar_App::$l10n = new OC_L10N('calendar');
+OC_Calendar_App::$l10n = OCP\Util::getL10N('calendar');
 OC_Calendar_App::$tz = OC_Calendar_App::getTimezone();
 class OC_Calendar_App{
 	const CALENDAR = 'calendar';