diff --git a/appinfo/database.xml b/appinfo/database.xml
index 73457e6c..9682e38c 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -9,7 +9,9 @@
 
  <table>
 
-  <name>*dbprefix*calendar_objects</name>
+  <name>*dbprefix*clndr_objects</name>
+
+  <was>*dbprefix*calendar_objects</was>
 
   <declaration>
 
@@ -98,7 +100,9 @@
 
  <table>
 
-  <name>*dbprefix*calendar_calendars</name>
+  <name>*dbprefix*clndr_calendars</name>
+
+  <was>*dbprefix*calendar_calendars</was>
 
   <declaration>
 
@@ -190,7 +194,9 @@
  
  <table>
 
-  <name>*dbprefix*calendar_share_event</name>
+  <name>*dbprefix*clndr_share_event</name>
+
+  <was>*dbprefix*calendar_share_event</was>
 
   <declaration>
   
@@ -237,7 +243,9 @@
  
  <table>
 
-  <name>*dbprefix*calendar_share_calendar</name>
+  <name>*dbprefix*clndr_share_calendar</name>
+
+  <was>*dbprefix*calendar_share_calendar</was>
 
   <declaration>
   
@@ -292,7 +300,9 @@
  
  <table>
 
-  <name>*dbprefix*calendar_repeat</name>
+  <name>*dbprefix*clndr_repeat</name>
+
+  <was>*dbprefix*calendar_repeat</was>
 
   <declaration>
 
diff --git a/appinfo/migrate.php b/appinfo/migrate.php
index 1b438937..a4863cc9 100644
--- a/appinfo/migrate.php
+++ b/appinfo/migrate.php
@@ -4,7 +4,7 @@ class OC_Migration_Provider_Calendar extends OC_Migration_Provider{
 	// Create the xml for the user supplied
 	function export( ) {
 		$options = array(
-			'table'=>'calendar_calendars',
+			'table'=>'clndr_calendars',
 			'matchcol'=>'userid',
 			'matchval'=>$this->uid,
 			'idcol'=>'id'
@@ -12,7 +12,7 @@ class OC_Migration_Provider_Calendar extends OC_Migration_Provider{
 		$ids = $this->content->copyRows( $options );
 
 		$options = array(
-			'table'=>'calendar_objects',
+			'table'=>'clndr_objects',
 			'matchcol'=>'calendarid',
 			'matchval'=>$ids
 		);
@@ -34,26 +34,26 @@ class OC_Migration_Provider_Calendar extends OC_Migration_Provider{
 		switch( $this->appinfo->version ) {
 			default:
 				// All versions of the app have had the same db structure, so all can use the same import function
-				$query = $this->content->prepare( 'SELECT * FROM calendar_calendars WHERE userid = ?' );
+				$query = $this->content->prepare( 'SELECT * FROM clndr_calendars WHERE userid = ?' );
 				$results = $query->execute( array( $this->olduid ) );
 				$idmap = array();
 				while( $row = $results->fetchRow() ) {
 					// Import each calendar
-					$calendarquery = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_calendars` (`userid`,`displayname`,`uri`,`ctag`,`calendarorder`,`calendarcolor`,`timezone`,`components`) VALUES(?,?,?,?,?,?,?,?)' );
+					$calendarquery = OCP\DB::prepare( 'INSERT INTO `*PREFIX*clndr_calendars` (`userid`,`displayname`,`uri`,`ctag`,`calendarorder`,`calendarcolor`,`timezone`,`components`) VALUES(?,?,?,?,?,?,?,?)' );
 					$calendarquery->execute(array( $this->uid, $row['displayname'], $row['uri'], $row['ctag'], $row['calendarorder'], $row['calendarcolor'], $row['timezone'], $row['components']));
 					// Map the id
-					$idmap[$row['id']] = OCP\DB::insertid('*PREFIX*calendar_calendars');
+					$idmap[$row['id']] = OCP\DB::insertid('*PREFIX*clndr_calendars');
 					// Make the calendar active
 					OC_Calendar_Calendar::setCalendarActive($idmap[$row['id']], true);
 				}
 				// Now tags
 				foreach($idmap as $oldid => $newid) {
 
-					$query = $this->content->prepare( 'SELECT * FROM calendar_objects WHERE calendarid = ?' );
+					$query = $this->content->prepare( 'SELECT * FROM clndr_objects WHERE calendarid = ?' );
 					$results = $query->execute( array( $oldid ) );
 					while( $row = $results->fetchRow() ) {
 						// Import the objects
-						$objectquery = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
+						$objectquery = OCP\DB::prepare( 'INSERT INTO `*PREFIX*clndr_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
 						$objectquery->execute(array( $newid, $row['objecttype'], $row['startdate'], $row['enddate'], $row['repeating'], $row['summary'], $row['calendardata'], $row['uri'], $row['lastmodified'] ));
 					}
 				}
diff --git a/appinfo/update.php b/appinfo/update.php
index ce7baf96..a312b89b 100644
--- a/appinfo/update.php
+++ b/appinfo/update.php
@@ -2,7 +2,7 @@
 
 $installedVersion=OCP\Config::getAppValue('calendar', 'installed_version');
 if (version_compare($installedVersion, '0.2.1', '<')) {
-	$stmt = OCP\DB::prepare( 'SELECT `id`, `calendarcolor` FROM `*PREFIX*calendar_calendars` WHERE `calendarcolor` IS NOT NULL' );
+	$stmt = OCP\DB::prepare( 'SELECT `id`, `calendarcolor` FROM `*PREFIX*clndr_calendars` WHERE `calendarcolor` IS NOT NULL' );
 	$result = $stmt->execute();
 	while( $row = $result->fetchRow()) {
 		$id = $row['id'];
@@ -11,7 +11,7 @@ if (version_compare($installedVersion, '0.2.1', '<')) {
 			continue;
 		}
 		$color = '#' .$color;
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `calendarcolor`=? WHERE `id`=?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*clndr_calendars` SET `calendarcolor`=? WHERE `id`=?' );
 		$r = $stmt->execute(array($color,$id));
 	}
 }
@@ -29,7 +29,7 @@ if ($installedVersion == '0.6') {
 	//$query->execute();
 }
 if (version_compare($installedVersion, '0.6.1', '<=')) {
-	$calendar_stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_calendar`');
+	$calendar_stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*clndr_share_calendar`');
 	$calendar_result = $calendar_stmt->execute();
 	while( $cal = $calendar_result->fetchRow()) {
 		$shareType = OCP\Share::SHARE_TYPE_USER;
@@ -47,7 +47,7 @@ if (version_compare($installedVersion, '0.6.1', '<=')) {
 			// nothing to do, the exception is already written to the log
 		}
 	}
-	$event_stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_event`');
+	$event_stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*clndr_share_event`');
 	$event_result = $event_stmt->execute();
 	while( $event = $event_result->fetchRow()) {
 		$shareType = OCP\Share::SHARE_TYPE_USER;
diff --git a/appinfo/version b/appinfo/version
index ee6cdce3..b1d7abc0 100644
--- a/appinfo/version
+++ b/appinfo/version
@@ -1 +1 @@
-0.6.1
+0.6.2
\ No newline at end of file
diff --git a/lib/calendar.php b/lib/calendar.php
index 266b7d07..632fb8fb 100644
--- a/lib/calendar.php
+++ b/lib/calendar.php
@@ -10,7 +10,7 @@
  * The following SQL statement is just a help for developers and will not be
  * executed!
  *
- * CREATE TABLE calendar_calendars (
+ * CREATE TABLE clndr_calendars (
  *     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
  *     userid VARCHAR(255),
  *     displayname VARCHAR(100),
@@ -42,7 +42,7 @@ class OC_Calendar_Calendar{
 			$active_where = ' AND `active` = ?';
 			$values[] = (int)$active;
 		}
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_calendars` WHERE `userid` = ?' . $active_where );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*clndr_calendars` WHERE `userid` = ?' . $active_where );
 		$result = $stmt->execute($values);
 
 		$calendars = array();
@@ -73,7 +73,7 @@ class OC_Calendar_Calendar{
 	 * @return associative array
 	 */
 	public static function find($id) {
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_calendars` WHERE `id` = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*clndr_calendars` WHERE `id` = ?' );
 		$result = $stmt->execute(array($id));
 
 		$row = $result->fetchRow();
@@ -108,10 +108,10 @@ class OC_Calendar_Calendar{
 
 		$uri = self::createURI($name, $uris );
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_calendars` (`userid`,`displayname`,`uri`,`ctag`,`calendarorder`,`calendarcolor`,`timezone`,`components`) VALUES(?,?,?,?,?,?,?,?)' );
+		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*clndr_calendars` (`userid`,`displayname`,`uri`,`ctag`,`calendarorder`,`calendarcolor`,`timezone`,`components`) VALUES(?,?,?,?,?,?,?,?)' );
 		$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
 
-		$insertid = OCP\DB::insertid('*PREFIX*calendar_calendars');
+		$insertid = OCP\DB::insertid('*PREFIX*clndr_calendars');
 		OCP\Util::emitHook('OC_Calendar', 'addCalendar', $insertid);
 
 		return $insertid;
@@ -146,10 +146,10 @@ class OC_Calendar_Calendar{
 	public static function addCalendarFromDAVData($principaluri,$uri,$name,$components,$timezone,$order,$color) {
 		$userid = self::extractUserID($principaluri);
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_calendars` (`userid`,`displayname`,`uri`,`ctag`,`calendarorder`,`calendarcolor`,`timezone`,`components`) VALUES(?,?,?,?,?,?,?,?)' );
+		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*clndr_calendars` (`userid`,`displayname`,`uri`,`ctag`,`calendarorder`,`calendarcolor`,`timezone`,`components`) VALUES(?,?,?,?,?,?,?,?)' );
 		$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
 
-		$insertid = OCP\DB::insertid('*PREFIX*calendar_calendars');
+		$insertid = OCP\DB::insertid('*PREFIX*clndr_calendars');
 		OCP\Util::emitHook('OC_Calendar', 'addCalendar', $insertid);
 
 		return $insertid;
@@ -188,7 +188,7 @@ class OC_Calendar_Calendar{
 		if(is_null($order)) $order = $calendar['calendarorder'];
 		if(is_null($color)) $color = $calendar['calendarcolor'];
 
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `displayname`=?,`calendarorder`=?,`calendarcolor`=?,`timezone`=?,`components`=?,`ctag`=`ctag`+1 WHERE `id`=?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*clndr_calendars` SET `displayname`=?,`calendarorder`=?,`calendarcolor`=?,`timezone`=?,`components`=?,`ctag`=`ctag`+1 WHERE `id`=?' );
 		$result = $stmt->execute(array($name,$order,$color,$timezone,$components,$id));
 
 		OCP\Util::emitHook('OC_Calendar', 'editCalendar', $id);
@@ -213,7 +213,7 @@ class OC_Calendar_Calendar{
 				);
 			}
 		}
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `active` = ? WHERE `id` = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*clndr_calendars` SET `active` = ? WHERE `id` = ?' );
 		$stmt->execute(array((int)$active, $id));
 
 		return true;
@@ -225,7 +225,7 @@ class OC_Calendar_Calendar{
 	 * @return boolean
 	 */
 	public static function touchCalendar($id) {
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `ctag` = `ctag` + 1 WHERE `id` = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*clndr_calendars` SET `ctag` = `ctag` + 1 WHERE `id` = ?' );
 		$stmt->execute(array($id));
 
 		return true;
@@ -248,7 +248,7 @@ class OC_Calendar_Calendar{
 				);
 			}
 		}
-		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_calendars` WHERE `id` = ?' );
+		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*clndr_calendars` WHERE `id` = ?' );
 		$stmt->execute(array($id));
 
 		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?' );
diff --git a/lib/import.php b/lib/import.php
index 5bdf6a0d..613682fd 100644
--- a/lib/import.php
+++ b/lib/import.php
@@ -303,7 +303,7 @@ class OC_Calendar_Import{
 	 */
 	private function isDuplicate($insertid) {
 		$newobject = OC_Calendar_Object::find($insertid);
-		$stmt = OCP\DB::prepare('SELECT COUNT(*) AS `count` FROM `*PREFIX*calendar_objects`
+		$stmt = OCP\DB::prepare('SELECT COUNT(*) AS `count` FROM `*PREFIX*clndr_objects`
 								 INNER JOIN `*PREFIX*calendar_calendars` ON `calendarid`=`*PREFIX*calendar_calendars`.`id`
 								 WHERE `objecttype`=? AND `startdate`=? AND `enddate`=? AND `repeating`=? AND `summary`=? AND `calendardata`=? AND `userid` = ?');
 		$result = $stmt->execute(array($newobject['objecttype'],$newobject['startdate'],$newobject['enddate'],$newobject['repeating'],$newobject['summary'],$newobject['calendardata'], $this->userid));
diff --git a/lib/object.php b/lib/object.php
index 7f1fdc32..8cc73044 100644
--- a/lib/object.php
+++ b/lib/object.php
@@ -12,7 +12,7 @@
  * The following SQL statement is just a help for developers and will not be
  * executed!
  *
- * CREATE TABLE calendar_objects (
+ * CREATE TABLE clndr_objects (
  *     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
  *     calendarid INTEGER UNSIGNED NOT NULL,
  *     objecttype VARCHAR(40) NOT NULL,
@@ -40,7 +40,7 @@ class OC_Calendar_Object{
 	 * ['calendardata']
 	 */
 	public static function all($id) {
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*clndr_objects` WHERE `calendarid` = ?' );
 		$result = $stmt->execute(array($id));
 
 		$calendarobjects = array();
@@ -62,7 +62,7 @@ class OC_Calendar_Object{
 	 * in ['calendardata']
 	 */
 	public static function allInPeriod($id, $start, $end) {
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?'
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*clndr_objects` WHERE `calendarid` = ?'
 		.' AND ((`startdate` >= ? AND `startdate` <= ? AND `repeating` = 0)'
 		.' OR (`enddate` >= ? AND `enddate` <= ? AND `repeating` = 0)'
 		.' OR (`startdate` <= ? AND `repeating` = 1))' );
@@ -87,7 +87,7 @@ class OC_Calendar_Object{
 	 * @return associative array
 	 */
 	public static function find($id) {
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `id` = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*clndr_objects` WHERE `id` = ?' );
 		$result = $stmt->execute(array($id));
 
 		return $result->fetchRow();
@@ -100,7 +100,7 @@ class OC_Calendar_Object{
 	 * @return associative array
 	 */
 	public static function findWhereDAVDataIs($cid,$uri) {
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ? AND `uri` = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*clndr_objects` WHERE `calendarid` = ? AND `uri` = ?' );
 		$result = $stmt->execute(array($cid,$uri));
 
 		return $result->fetchRow();
@@ -134,9 +134,9 @@ class OC_Calendar_Object{
 
 		$uri = 'owncloud-'.md5($data.rand().time()).'.ics';
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
+		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*clndr_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
 		$stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
-		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
+		$object_id = OCP\DB::insertid('*PREFIX*clndr_objects');
 
 		OC_Calendar_App::loadCategoriesFromVCalendar($object_id, $object);
 
@@ -167,9 +167,9 @@ class OC_Calendar_Object{
 		$object = OC_VObject::parse($data);
 		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
+		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*clndr_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
 		$stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
-		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
+		$object_id = OCP\DB::insertid('*PREFIX*clndr_objects');
 
 		OC_Calendar_Calendar::touchCalendar($id);
 		OCP\Util::emitHook('OC_Calendar', 'addEvent', $object_id);
@@ -203,7 +203,7 @@ class OC_Calendar_Object{
 		OC_Calendar_App::loadCategoriesFromVCalendar($id, $object);
 		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
 
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `objecttype`=?,`startdate`=?,`enddate`=?,`repeating`=?,`summary`=?,`calendardata`=?,`lastmodified`= ? WHERE `id` = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*clndr_objects` SET `objecttype`=?,`startdate`=?,`enddate`=?,`repeating`=?,`summary`=?,`calendardata`=?,`lastmodified`= ? WHERE `id` = ?' );
 		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$id));
 
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
@@ -238,7 +238,7 @@ class OC_Calendar_Object{
 		$object = OC_VObject::parse($data);
 		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
 
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `objecttype`=?,`startdate`=?,`enddate`=?,`repeating`=?,`summary`=?,`calendardata`=?,`lastmodified`= ? WHERE `id` = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*clndr_objects` SET `objecttype`=?,`startdate`=?,`enddate`=?,`repeating`=?,`summary`=?,`calendardata`=?,`lastmodified`= ? WHERE `id` = ?' );
 		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$oldobject['id']));
 
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
@@ -269,7 +269,7 @@ class OC_Calendar_Object{
 				);
 			}
 		}
-		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_objects` WHERE `id` = ?' );
+		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*clndr_objects` WHERE `id` = ?' );
 		$stmt->execute(array($id));
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
 
@@ -301,7 +301,7 @@ class OC_Calendar_Object{
 				);
 			}
 		}
-		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_objects` WHERE `calendarid`= ? AND `uri`=?' );
+		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*clndr_objects` WHERE `calendarid`= ? AND `uri`=?' );
 		$stmt->execute(array($cid,$uri));
 		OC_Calendar_Calendar::touchCalendar($cid);
 		OCP\Util::emitHook('OC_Calendar', 'deleteEvent', $oldobject['id']);
@@ -321,7 +321,7 @@ class OC_Calendar_Object{
 				);
 			}
 		}
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `calendarid`=? WHERE `id`=?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*clndr_objects` SET `calendarid`=? WHERE `id`=?' );
 		$stmt->execute(array($calendarid,$id));
 
 		OC_Calendar_Calendar::touchCalendar($calendarid);
diff --git a/lib/repeat.php b/lib/repeat.php
index a613697d..b6b01938 100644
--- a/lib/repeat.php
+++ b/lib/repeat.php
@@ -16,7 +16,7 @@ class OC_Calendar_Repeat{
 	 * @return (array)
 	 */
 	public static function get($id) {
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_repeat` WHERE `eventid` = ?');
+		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*clndr_repeat` WHERE `eventid` = ?');
 		$result = $stmt->execute(array($id));
 		$return = array();
 		while($row = $result->fetchRow()) {
@@ -32,7 +32,7 @@ class OC_Calendar_Repeat{
 	 * @return (array)
 	 */
 	public static function get_inperiod($id, $from, $until) {
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_repeat` WHERE `eventid` = ?'
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*clndr_repeat` WHERE `eventid` = ?'
 		.' AND ((`startdate` >= ? AND `startdate` <= ?)'
 		.' OR (`enddate` >= ? AND `enddate` <= ?))');
 		$result = $stmt->execute(array($id,
@@ -50,7 +50,7 @@ class OC_Calendar_Repeat{
 	 * @return (array)
 	 */
 	public static function getCalendar($id) {
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_repeat` WHERE `calid` = ?');
+		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*clndr_repeat` WHERE `calid` = ?');
 		$result = $stmt->execute(array($id));
 		$return = array();
 		while($row = $result->fetchRow()) {
@@ -66,7 +66,7 @@ class OC_Calendar_Repeat{
 	 * @return (array)
 	 */
 	public static function getCalendar_inperiod($id, $from, $until) {
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_repeat` WHERE `calid` = ?'
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*clndr_repeat` WHERE `calid` = ?'
 		.' AND ((`startdate` >= ? AND `startdate` <= ?)'
 		.' OR (`enddate` >= ? AND `enddate` <= ?))');
 		$result = $stmt->execute(array($id,
@@ -99,7 +99,7 @@ class OC_Calendar_Repeat{
 				continue;
 			}
 			$startenddate = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), ($vevent->DTSTART->getDateType() == Sabre\VObject\Property\DateTime::DATE)?true:false, 'UTC');
-			$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*calendar_repeat` (`eventid`,`calid`,`startdate`,`enddate`) VALUES(?,?,?,?)');
+			$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*clndr_repeat` (`eventid`,`calid`,`startdate`,`enddate`) VALUES(?,?,?,?)');
 			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startenddate['start'],$startenddate['end']));
 		}
 		return true;
@@ -189,7 +189,7 @@ class OC_Calendar_Repeat{
 	 * @return (bool)
 	 */
 	public static function clean($id) {
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_repeat` WHERE `eventid` = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*clndr_repeat` WHERE `eventid` = ?');
 		$stmt->execute(array($id));
 	}
 	/**
@@ -198,7 +198,7 @@ class OC_Calendar_Repeat{
 	 * @return (bool)
 	 */
 	public static function cleanCalendar($id) {
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_repeat` WHERE `calid` = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*clndr_repeat` WHERE `calid` = ?');
 		$stmt->execute(array($id));
 	}
 }
\ No newline at end of file
diff --git a/lib/share/calendar.php b/lib/share/calendar.php
index bef0b6a4..66fde7f9 100644
--- a/lib/share/calendar.php
+++ b/lib/share/calendar.php
@@ -103,7 +103,7 @@ class OC_Share_Backend_Calendar implements OCP\Share_Backend_Collection {
 	}
 
 	public function getChildren($itemSource) {
-		$query = OCP\DB::prepare('SELECT `id`, `summary` FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?');
+		$query = OCP\DB::prepare('SELECT `id`, `summary` FROM `*PREFIX*clndr_objects` WHERE `calendarid` = ?');
 		$result = $query->execute(array($itemSource));
 		$children = array();
 		while ($object = $result->fetchRow()) {