diff --git a/lib/backgroundjob/regulartask.php b/lib/backgroundjob/regulartask.php
index 5c416fcdb0e0e9b35875a47559eea500f297ac6d..53bd4eb5e9b0e70c4ebbefddafb25eb95bd68428 100644
--- a/lib/backgroundjob/regulartask.php
+++ b/lib/backgroundjob/regulartask.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* ownCloud - Background Job
+* ownCloud
 *
 * @author Jakob Sack
 * @copyright 2012 Jakob Sack owncloud@jakobsack.de
diff --git a/lib/backgroundjob/scheduledtask.php b/lib/backgroundjob/scheduledtask.php
index 5a2166175c7581e7e55eb26a62a729cab0533a24..47f332a204a3b1b3dadae2eb40c6ed8a04156c49 100644
--- a/lib/backgroundjob/scheduledtask.php
+++ b/lib/backgroundjob/scheduledtask.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* ownCloud - Background Job
+* ownCloud
 *
 * @author Jakob Sack
 * @copyright 2012 Jakob Sack owncloud@jakobsack.de
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 9709882978b88e7ef1647b9be012aaa80e6df1a9..23757529ad8dcc6be1a296de8fb8d5e7df2ae3d1 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* ownCloud - Background Job
+* ownCloud
 *
 * @author Jakob Sack
 * @copyright 2012 Jakob Sack owncloud@jakobsack.de
@@ -59,12 +59,12 @@ class OC_BackgroundJob_Worker{
 	 * with the next step. This method should be used by webcron and ajax
 	 * services.
 	 */
-	public static function doWebStep(){
-		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+	public static function doNextStep(){
+		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjob_step', 'regular_tasks' );
 		
 		if( $laststep == 'regular_tasks' ){
 			// get last app
-			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
+			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjob_task', '' );
 
 			// What's the next step?
 			$regular_tasks = OC_BackgroundJob_RegularTask::all();
@@ -74,7 +74,7 @@ class OC_BackgroundJob_Worker{
 			// search for next background job
 			foreach( $regular_tasks as $key => $value ){
 				if( strcmp( $lasttask, $key ) > 0 ){
-					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
+					OC_Appconfig::getValue( 'core', 'backgroundjob_task', $key );
 					$done = true;
 					call_user_func( $value );
 					break;
@@ -83,7 +83,7 @@ class OC_BackgroundJob_Worker{
 
 			if( $done == false ){
 				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjob_step', 'scheduled_tasks' );
 			}
 		}
 		else{
@@ -99,8 +99,8 @@ class OC_BackgroundJob_Worker{
 			}
 			else{
 				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
+				OC_Appconfig::setValue( 'core', 'backgroundjob_step', 'regular_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjob_task', '' );
 			}
 		}