diff --git a/core/setup.php b/core/setup.php
index 1a2eac1603..4758c23b04 100644
--- a/core/setup.php
+++ b/core/setup.php
@@ -34,7 +34,7 @@ $opts = array(
 	'hasMSSQL' => $hasMSSQL,
 	'directory' => $datadir,
 	'secureRNG' => OC_Util::secureRNGAvailable(),
-	'htaccessWorking' => OC_Util::isHtaccessWorking(),
+	'htaccessWorking' => OC_Util::isHtAccessWorking(),
 	'vulnerableToNullByte' => $vulnerableToNullByte,
 	'errors' => array(),
 );
diff --git a/lib/base.php b/lib/base.php
index 7a4f5fc7ce..32e0ebe27e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -413,7 +413,7 @@ class OC {
 		}
 
 		self::initPaths();
-		OC_Util::isSetlocaleWorking();
+		OC_Util::isSetLocaleWorking();
 
 		// set debug mode if an xdebug session is active
 		if (!defined('DEBUG') || !DEBUG) {
@@ -522,7 +522,7 @@ class OC {
 		}
 
 		// write error into log if locale can't be set
-		if (OC_Util::isSetlocaleWorking() == false) {
+		if (OC_Util::isSetLocaleWorking() == false) {
 			OC_Log::write('core',
 				'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system',
 				OC_Log::ERROR);
diff --git a/lib/util.php b/lib/util.php
index 24ae7d3d1c..10b526ef6b 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -18,9 +18,11 @@ class OC_Util {
 	 * @brief Can be set up
 	 * @param user string
 	 * @return boolean
+	 * @description configure the initial filesystem based on the configuration
 	 */
-	public static function setupFS( $user = '' ) { // configure the initial filesystem based on the configuration
-		if(self::$fsSetup) { //setting up the filesystem twice can only lead to trouble
+	public static function setupFS( $user = '' ) {
+		//setting up the filesystem twice can only lead to trouble
+		if(self::$fsSetup) {
 			return false;
 		}
 
@@ -71,11 +73,11 @@ class OC_Util {
 
 	/**
 	 * @return void
-         */
+	 */
 	public static function tearDownFS() {
 		\OC\Files\Filesystem::tearDown();
 		self::$fsSetup=false;
-	        self::$rootMounted=false;
+		self::$rootMounted=false;
 	}
 
 	/**
@@ -165,9 +167,10 @@ class OC_Util {
 	 * @param int timestamp $timestamp
 	 * @param bool dateOnly option to omit time from the result
 	 * @return string timestamp
+	 * @description adjust to clients timezone if we know it
 	 */
 	public static function formatDate( $timestamp, $dateOnly=false) {
-		if(\OC::$session->exists('timezone')) { //adjust to clients timezone if we know it
+		if(\OC::$session->exists('timezone')) {
 			$systemTimeZone = intval(date('O'));
 			$systemTimeZone = (round($systemTimeZone/100, 0)*60) + ($systemTimeZone%100);
 			$clientTimeZone = \OC::$session->get('timezone')*60;
@@ -629,13 +632,15 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check if the htaccess file is working by creating a test file in the data directory and trying to access via http
+	 * @brief Check if the htaccess file is working
 	 * @return bool
+	 * @description Check if the htaccess file is working by creating a test
+	 * file in the data directory and trying to access via http
 	 */
-	public static function isHtaccessWorking() {
+	public static function isHtAccessWorking() {
 		// testdata
-		$filename = '/htaccesstest.txt';
-		$testcontent = 'testcontent';
+		$fileName = '/htaccesstest.txt';
+		$testContent = 'testcontent';
 
 		// creating a test file
 		$testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename;
@@ -718,7 +723,7 @@ class OC_Util {
 	 * local packages are not available on the server.
 	 * @return bool
 	 */
-	public static function isSetlocaleWorking() {
+	public static function isSetLocaleWorking() {
 		// setlocale test is pointless on Windows
 		if (OC_Util::runningOnWindows() ) {
 			return true;
diff --git a/settings/admin.php b/settings/admin.php
index d721593eb7..0cbb98756d 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -15,7 +15,7 @@ OC_App::setActiveNavigationEntry( "admin" );
 
 $tmpl = new OC_Template( 'settings', 'admin', 'user');
 $forms=OC_App::getForms('admin');
-$htaccessworking=OC_Util::isHtaccessWorking();
+$htaccessworking=OC_Util::isHtAccessWorking();
 
 $entries=OC_Log_Owncloud::getEntries(3);
 $entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
@@ -25,7 +25,7 @@ $tmpl->assign('entries', $entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking', $htaccessworking);
 $tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
-$tmpl->assign('islocaleworking', OC_Util::isSetlocaleWorking());
+$tmpl->assign('islocaleworking', OC_Util::isSetLocaleWorking());
 $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));