diff --git a/lib/db/mdb2schemareader.php b/lib/db/mdb2schemareader.php
index 00b880a68b4cb6eac6846b3d3b06c8dcb048df9c..19d0ba4d4ea80a3728e1bf55f4f0704bb65f8e0f 100644
--- a/lib/db/mdb2schemareader.php
+++ b/lib/db/mdb2schemareader.php
@@ -55,6 +55,7 @@ class OC_DB_MDB2SchemaReader {
 				case 'name':
 					$name = (string)$child;
 					$name = str_replace( '*dbprefix*', self::$DBTABLEPREFIX, $name );
+					$name = self::$platform->quoteIdentifier($name);
 					$table = $schema->createTable($name);
 					break;
 				case 'create':
@@ -98,6 +99,7 @@ class OC_DB_MDB2SchemaReader {
 			switch($child->getName()) {
 				case 'name':
 					$name = (string)$child;
+					$name = self::$platform->quoteIdentifier($name);
 					break;
 				case 'type':
 					$type = (string)$child;
@@ -189,10 +191,7 @@ class OC_DB_MDB2SchemaReader {
 						switch($field->getName()) {
 							case 'name':
 								$field_name = (string)$field;
-								$keywords = self::$platform->getReservedKeywordsList();
-								if ($keywords->isKeyword($field_name)) {
-									$field_name = self::$platform->quoteIdentifier($field_name);
-								}
+								$field_name = self::$platform->quoteIdentifier($field_name);
 								$fields[] = $field_name;
 								break;
 							case 'sorting':