diff --git a/apps/admin_migrate/settings.php b/apps/admin_migrate/settings.php
index da96e1a868..7d3fd04179 100755
--- a/apps/admin_migrate/settings.php
+++ b/apps/admin_migrate/settings.php
@@ -23,7 +23,7 @@
  *
  */
 OCP\User::checkAdminUser();
-OC_Util::checkAppEnabled('admin_migrate');
+OCP\App::checkAppEnabled('admin_migrate');
 
 // Export?
 if (isset($_POST['admin_export'])) {
diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
index afe6187573..313489d22f 100755
--- a/apps/bookmarks/addBm.php
+++ b/apps/bookmarks/addBm.php
@@ -25,7 +25,7 @@
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('bookmarks');
+OCP\App::checkAppEnabled('bookmarks');
 
 require_once('bookmarksHelper.php');
 addBookmark($_GET['url'], '', 'Read-Later');
diff --git a/apps/bookmarks/index.php b/apps/bookmarks/index.php
index bfac1d2934..f545d79da6 100755
--- a/apps/bookmarks/index.php
+++ b/apps/bookmarks/index.php
@@ -25,7 +25,7 @@
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('bookmarks');
+OCP\App::checkAppEnabled('bookmarks');
 
 OCP\App::setActiveNavigationEntry( 'bookmarks_index' );
 
diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php
old mode 100644
new mode 100755
index 0c1a8f9494..9ee989c0de
--- a/apps/calendar/ajax/import/dialog.php
+++ b/apps/calendar/ajax/import/dialog.php
@@ -8,7 +8,7 @@
 
  
 OC_JSON::checkLoggedIn();
-OC_Util::checkAppEnabled('calendar');
+OCP\App::checkAppEnabled('calendar');
 $tmpl = new OC_Template('calendar', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index eda34099ab..43dfb5493f 100755
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -8,7 +8,7 @@
 //check for calendar rights or create new one
 ob_start();
 OC_JSON::checkLoggedIn();
-OC_Util::checkAppEnabled('calendar');
+OCP\App::checkAppEnabled('calendar');
 $nl="\r\n";
 $comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
 $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
old mode 100644
new mode 100755
index 2fbb973d5c..32b454ee90
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -9,7 +9,7 @@
 $RUNTIME_NOSETUPFS = true;
 require_once('../lib/base.php');
 
-OC_Util::checkAppEnabled('calendar');
+OCP\App::checkAppEnabled('calendar');
 
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();
diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index 9b71bc6910..0756e1df20 100755
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -8,7 +8,7 @@
 
  
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('calendar');
+OCP\App::checkAppEnabled('calendar');
 $cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
 $event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
 $nl = "\r\n";
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index dcc7e25e3e..3a3915b966 100755
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -8,7 +8,7 @@
 
  
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('calendar');
+OCP\App::checkAppEnabled('calendar');
 
 // Create default calendar ...
 $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
diff --git a/apps/contacts/ajax/importaddressbook.php b/apps/contacts/ajax/importaddressbook.php
index e54d22b9ca..dc251de201 100755
--- a/apps/contacts/ajax/importaddressbook.php
+++ b/apps/contacts/ajax/importaddressbook.php
@@ -8,7 +8,7 @@
 
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
-OC_Util::checkAppEnabled('contacts');
+OCP\App::checkAppEnabled('contacts');
 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
 $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
diff --git a/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php
old mode 100644
new mode 100755
index cde6bb2f5c..bd195023dd
--- a/apps/contacts/ajax/importdialog.php
+++ b/apps/contacts/ajax/importdialog.php
@@ -8,7 +8,7 @@
 
  
 OC_JSON::checkLoggedIn();
-OC_Util::checkAppEnabled('contacts');
+OCP\App::checkAppEnabled('contacts');
 $tmpl = new OC_Template('contacts', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
old mode 100644
new mode 100755
index 3ffdb64b52..804c560e3d
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -23,7 +23,7 @@
 $RUNTIME_NOSETUPFS = true;
 require_once('../lib/base.php');
 
-OC_Util::checkAppEnabled('contacts');
+OCP\App::checkAppEnabled('contacts');
 
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index 84bf26042f..4e4ade2f2b 100755
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -8,7 +8,7 @@
 
  
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('contacts');
+OCP\App::checkAppEnabled('contacts');
 $bookid = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
 $contactid = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
 $nl = "\n";
diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 9355f8b9f7..2bcb40f7d4 100755
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -9,7 +9,7 @@
 ob_start();
  
 OC_JSON::checkLoggedIn();
-OC_Util::checkAppEnabled('contacts');
+OCP\App::checkAppEnabled('contacts');
 $nl = "\n";
 $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
 if(is_writable('import_tmp/')){
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 8e3c2faf01..814a8927f3 100755
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -10,7 +10,7 @@
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('contacts');
+OCP\App::checkAppEnabled('contacts');
 
 // Get active address books. This creates a default one if none exists.
 $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index a545afc434..60723b7f0b 100755
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -11,7 +11,7 @@
 // Init owncloud
 
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('contacts');
+OCP\App::checkAppEnabled('contacts');
 
 function getStandardImage(){
 	OC_Response::setExpiresHeader('P10D');
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 239ec7f4d4..cf54b4ffd4 100755
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -24,7 +24,7 @@
 
 OC_JSON::checkLoggedIn();
 //OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('contacts');
+OCP\App::checkAppEnabled('contacts');
 
 function getStandardImage(){
 	OC_Response::setExpiresHeader('P10D');
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index eb1ed8a186..2fe6bc88e6 100755
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -24,7 +24,7 @@
 require_once('lib_share.php');
 
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('files_sharing');
+OCP\App::checkAppEnabled('files_sharing');
 
 OCP\App::setActiveNavigationEntry("files_sharing_list");
 
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index 4d49e3212e..cf8bea1421 100755
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -24,7 +24,7 @@
 
 
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('gallery');
+OCP\App::checkAppEnabled('gallery');
 OCP\App::setActiveNavigationEntry( 'gallery_index' );
 
 if (!file_exists(OCP\Config::getSystemValue("datadirectory").'/'. OCP\USER::getUser() .'/gallery')) {
diff --git a/apps/gallery/sharing.php b/apps/gallery/sharing.php
old mode 100644
new mode 100755
index 2739f63d4e..44fcd9c864
--- a/apps/gallery/sharing.php
+++ b/apps/gallery/sharing.php
@@ -27,7 +27,7 @@ if (!isset($_GET['token']) || empty($_GET['token'])) {
 
 
 
-OC_Util::checkAppEnabled('gallery');
+OCP\App::checkAppEnabled('gallery');
 
 ?>
 <!doctype html>
diff --git a/apps/media/index.php b/apps/media/index.php
index df597c3108..e2911361ea 100755
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -26,7 +26,7 @@
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('media');
+OCP\App::checkAppEnabled('media');
 
 require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');
 require_once(OC::$APPSROOT . '/apps/media/lib_scanner.php');
diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php
index bf277f3491..63f2a51dcb 100755
--- a/apps/media/server/xml.server.php
+++ b/apps/media/server/xml.server.php
@@ -23,7 +23,7 @@
 
 require_once('../../inc.php');
 
-OC_Util::checkAppEnabled('media');
+OCP\App::checkAppEnabled('media');
  require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');
  require_once(OC::$APPSROOT . '/apps/media/lib_ampache.php');
 
diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/WebDAV.php
old mode 100644
new mode 100755
index 3522d1ed68..45f6cac316
--- a/apps/remoteStorage/WebDAV.php
+++ b/apps/remoteStorage/WebDAV.php
@@ -30,7 +30,7 @@
 $RUNTIME_NOSETUPFS = true;
 
 
-OC_Util::checkAppEnabled('remoteStorage');
+OCP\App::checkAppEnabled('remoteStorage');
 require_once('Sabre/autoload.php');
 require_once('lib_remoteStorage.php');
 require_once('BearerAuth.php');
diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php
old mode 100644
new mode 100755
index 376fe29b3e..235a02107e
--- a/apps/remoteStorage/ajax/revokeToken.php
+++ b/apps/remoteStorage/ajax/revokeToken.php
@@ -30,7 +30,7 @@
 $RUNTIME_NOSETUPFS = true;
 
  
-OC_Util::checkAppEnabled('remoteStorage');
+OCP\App::checkAppEnabled('remoteStorage');
 require_once('Sabre/autoload.php');
 require_once('../lib_remoteStorage.php');
 
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index 682c1e97f6..a5cbd6aca0 100755
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -30,7 +30,7 @@
 $RUNTIME_NOSETUPFS = true;
 
 
-OC_Util::checkAppEnabled('remoteStorage');
+OCP\App::checkAppEnabled('remoteStorage');
 require_once('Sabre/autoload.php');
 require_once('lib_remoteStorage.php');
 require_once('oauth_ro_auth.php');
diff --git a/apps/user_migrate/admin.php b/apps/user_migrate/admin.php
index 518e4f43f6..93f9d59aa4 100755
--- a/apps/user_migrate/admin.php
+++ b/apps/user_migrate/admin.php
@@ -21,7 +21,7 @@
  *
  */
 OCP\User::checkAdminUser();
-OC_Util::checkAppEnabled('user_migrate');
+OCP\App::checkAppEnabled('user_migrate');
 
 // Import?
 if (isset($_POST['user_import'])) {
diff --git a/apps/user_migrate/ajax/export.php b/apps/user_migrate/ajax/export.php
index 874c042828..ef8e331c68 100755
--- a/apps/user_migrate/ajax/export.php
+++ b/apps/user_migrate/ajax/export.php
@@ -25,7 +25,7 @@
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
-OC_Util::checkAppEnabled('user_migrate');
+OCP\App::checkAppEnabled('user_migrate');
 // Which operation
 if( $_GET['operation']=='create' ){
 	$uid = !empty( $_POST['uid'] ) ? $_POST['uid'] :  OCP\USER::getUser();
diff --git a/apps/user_migrate/settings.php b/apps/user_migrate/settings.php
old mode 100644
new mode 100755
index 62f347b355..2994d10a1e
--- a/apps/user_migrate/settings.php
+++ b/apps/user_migrate/settings.php
@@ -22,7 +22,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-OC_Util::checkAppEnabled('user_migrate');
+OCP\App::checkAppEnabled('user_migrate');
 
 // fill template
 $tmpl = new OC_Template('user_migrate', 'settings');
diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php
index 22b3a8ba73..9f751da5ed 100755
--- a/apps/user_openid/user.php
+++ b/apps/user_openid/user.php
@@ -37,7 +37,7 @@ if($USERNAME=='' and isset($_SERVER['PHP_AUTH_USER'])){
 $RUNTIME_NOAPPS=true;
 $RUNTIME_NOAPPS=false;
 require_once '../../lib/base.php';
-OC_Util::checkAppEnabled('user_openid');
+OCP\App::checkAppEnabled('user_openid');
 
 if(!OCP\User::userExists($USERNAME)){
 	OCP\Util::writeLog('user_openid',$USERNAME.' doesn\'t exist',OCP\Util::WARN);