diff --git a/apps/dav/lib/Migration/Version1005Date20180413093149.php b/apps/dav/lib/Migration/Version1005Date20180413093149.php
index 3b02726ab7..dca148fbdf 100644
--- a/apps/dav/lib/Migration/Version1005Date20180413093149.php
+++ b/apps/dav/lib/Migration/Version1005Date20180413093149.php
@@ -26,7 +26,7 @@ declare(strict_types=1);
 
 namespace OCA\DAV\Migration;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -47,26 +47,26 @@ class Version1005Date20180413093149 extends SimpleMigrationStep {
 		if (!$schema->hasTable('directlink')) {
 			$table = $schema->createTable('directlink');
 
-			$table->addColumn('id',Type::BIGINT, [
+			$table->addColumn('id',Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 11,
 				'unsigned' => true,
 			]);
-			$table->addColumn('user_id', Type::STRING, [
+			$table->addColumn('user_id', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 			]);
-			$table->addColumn('file_id', Type::BIGINT, [
+			$table->addColumn('file_id', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 11,
 				'unsigned' => true,
 			]);
-			$table->addColumn('token', Type::STRING, [
+			$table->addColumn('token', Types::STRING, [
 				'notnull' => false,
 				'length' => 60,
 			]);
-			$table->addColumn('expiration', Type::BIGINT, [
+			$table->addColumn('expiration', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 11,
 				'unsigned' => true,
diff --git a/apps/dav/lib/Migration/Version1005Date20180530124431.php b/apps/dav/lib/Migration/Version1005Date20180530124431.php
index 71f6064c5c..a270f903f1 100644
--- a/apps/dav/lib/Migration/Version1005Date20180530124431.php
+++ b/apps/dav/lib/Migration/Version1005Date20180530124431.php
@@ -26,7 +26,7 @@
 
 namespace OCA\DAV\Migration;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -49,29 +49,29 @@ class Version1005Date20180530124431 extends SimpleMigrationStep {
 			if (!$schema->hasTable('calendar_' . $type)) {
 				$table = $schema->createTable('calendar_' . $type);
 
-				$table->addColumn('id', Type::BIGINT, [
+				$table->addColumn('id', Types::BIGINT, [
 					'autoincrement' => true,
 					'notnull' => true,
 					'length' => 11,
 					'unsigned' => true,
 				]);
-				$table->addColumn('backend_id', Type::STRING, [
+				$table->addColumn('backend_id', Types::STRING, [
 					'notnull' => false,
 					'length' => 64,
 				]);
-				$table->addColumn('resource_id', Type::STRING, [
+				$table->addColumn('resource_id', Types::STRING, [
 					'notnull' => false,
 					'length' => 64,
 				]);
-				$table->addColumn('email', Type::STRING, [
+				$table->addColumn('email', Types::STRING, [
 					'notnull' => false,
 					'length' => 255,
 				]);
-				$table->addColumn('displayname', Type::STRING, [
+				$table->addColumn('displayname', Types::STRING, [
 					'notnull' => false,
 					'length' => 255,
 				]);
-				$table->addColumn('group_restrictions', Type::STRING, [
+				$table->addColumn('group_restrictions', Types::STRING, [
 					'notnull' => false,
 					'length' => 4000,
 				]);
diff --git a/apps/dav/lib/Migration/Version1006Date20180619154313.php b/apps/dav/lib/Migration/Version1006Date20180619154313.php
index d3590a3ff4..883307c113 100644
--- a/apps/dav/lib/Migration/Version1006Date20180619154313.php
+++ b/apps/dav/lib/Migration/Version1006Date20180619154313.php
@@ -25,7 +25,7 @@
  */
 namespace OCA\DAV\Migration;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -49,38 +49,38 @@ class Version1006Date20180619154313 extends SimpleMigrationStep {
 		if (!$schema->hasTable('calendar_invitations')) {
 			$table = $schema->createTable('calendar_invitations');
 
-			$table->addColumn('id', Type::BIGINT, [
+			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 11,
 				'unsigned' => true,
 			]);
-			$table->addColumn('uid', Type::STRING, [
+			$table->addColumn('uid', Types::STRING, [
 				'notnull' => true,
 				'length' => 255,
 			]);
-			$table->addColumn('recurrenceid', Type::STRING, [
+			$table->addColumn('recurrenceid', Types::STRING, [
 				'notnull' => false,
 				'length' => 255,
 			]);
-			$table->addColumn('attendee', Type::STRING, [
+			$table->addColumn('attendee', Types::STRING, [
 				'notnull' => true,
 				'length' => 255,
 			]);
-			$table->addColumn('organizer', Type::STRING, [
+			$table->addColumn('organizer', Types::STRING, [
 				'notnull' => true,
 				'length' => 255,
 			]);
-			$table->addColumn('sequence', Type::BIGINT, [
+			$table->addColumn('sequence', Types::BIGINT, [
 				'notnull' => false,
 				'length' => 11,
 				'unsigned' => true,
 			]);
-			$table->addColumn('token', Type::STRING, [
+			$table->addColumn('token', Types::STRING, [
 				'notnull' => true,
 				'length' => 60,
 			]);
-			$table->addColumn('expiration', Type::BIGINT, [
+			$table->addColumn('expiration', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 11,
 				'unsigned' => true,
diff --git a/apps/dav/lib/Migration/Version1006Date20180628111625.php b/apps/dav/lib/Migration/Version1006Date20180628111625.php
index 08a5951d8d..d83b23b27f 100644
--- a/apps/dav/lib/Migration/Version1006Date20180628111625.php
+++ b/apps/dav/lib/Migration/Version1006Date20180628111625.php
@@ -28,7 +28,7 @@ declare(strict_types=1);
 
 namespace OCA\DAV\Migration;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -47,7 +47,7 @@ class Version1006Date20180628111625 extends SimpleMigrationStep {
 
 		if ($schema->hasTable('calendarchanges')) {
 			$calendarChangesTable = $schema->getTable('calendarchanges');
-			$calendarChangesTable->addColumn('calendartype', Type::INTEGER, [
+			$calendarChangesTable->addColumn('calendartype', Types::INTEGER, [
 				'notnull' => true,
 				'default' => 0,
 			]);
@@ -60,7 +60,7 @@ class Version1006Date20180628111625 extends SimpleMigrationStep {
 
 		if ($schema->hasTable('calendarobjects')) {
 			$calendarObjectsTable = $schema->getTable('calendarobjects');
-			$calendarObjectsTable->addColumn('calendartype', Type::INTEGER, [
+			$calendarObjectsTable->addColumn('calendartype', Types::INTEGER, [
 				'notnull' => true,
 				'default' => 0,
 			]);
@@ -73,7 +73,7 @@ class Version1006Date20180628111625 extends SimpleMigrationStep {
 
 		if ($schema->hasTable('calendarobjects_props')) {
 			$calendarObjectsPropsTable = $schema->getTable('calendarobjects_props');
-			$calendarObjectsPropsTable->addColumn('calendartype', Type::INTEGER, [
+			$calendarObjectsPropsTable->addColumn('calendartype', Types::INTEGER, [
 				'notnull' => true,
 				'default' => 0,
 			]);
diff --git a/apps/dav/lib/Migration/Version1008Date20181030113700.php b/apps/dav/lib/Migration/Version1008Date20181030113700.php
index 97f1a72062..530399cae5 100644
--- a/apps/dav/lib/Migration/Version1008Date20181030113700.php
+++ b/apps/dav/lib/Migration/Version1008Date20181030113700.php
@@ -27,7 +27,7 @@ namespace OCA\DAV\Migration;
 
 use Closure;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -45,7 +45,7 @@ class Version1008Date20181030113700 extends SimpleMigrationStep {
 		$schema = $schemaClosure();
 
 		$table = $schema->getTable('cards');
-		$table->addColumn('uid', Type::STRING, [
+		$table->addColumn('uid', Types::STRING, [
 			'notnull' => false,
 			'length' => 255
 		]);
diff --git a/apps/dav/lib/Migration/Version1008Date20181105104826.php b/apps/dav/lib/Migration/Version1008Date20181105104826.php
index cc80c6552c..93a5163e6f 100644
--- a/apps/dav/lib/Migration/Version1008Date20181105104826.php
+++ b/apps/dav/lib/Migration/Version1008Date20181105104826.php
@@ -27,7 +27,7 @@ declare(strict_types=1);
 namespace OCA\DAV\Migration;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
@@ -58,7 +58,7 @@ class Version1008Date20181105104826 extends SimpleMigrationStep {
 		$schema = $schemaClosure();
 		$table = $schema->getTable('calendarsubscriptions');
 
-		$table->addColumn('source_copy', Type::TEXT, [
+		$table->addColumn('source_copy', Types::TEXT, [
 			'notnull' => false,
 			'length' => null,
 		]);
diff --git a/apps/dav/lib/Migration/Version1008Date20181105110300.php b/apps/dav/lib/Migration/Version1008Date20181105110300.php
index e36ec34dd8..55b14f3ccb 100644
--- a/apps/dav/lib/Migration/Version1008Date20181105110300.php
+++ b/apps/dav/lib/Migration/Version1008Date20181105110300.php
@@ -27,7 +27,7 @@ declare(strict_types=1);
 namespace OCA\DAV\Migration;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
@@ -57,7 +57,7 @@ class Version1008Date20181105110300 extends SimpleMigrationStep {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 		$table = $schema->getTable('calendarsubscriptions');
-		$table->addColumn('source', Type::TEXT, [
+		$table->addColumn('source', Types::TEXT, [
 			'notnull' => false,
 			'length' => null,
 		]);
diff --git a/apps/dav/lib/Migration/Version1011Date20190725113607.php b/apps/dav/lib/Migration/Version1011Date20190725113607.php
index 4163d0d0ec..5a25bf126d 100644
--- a/apps/dav/lib/Migration/Version1011Date20190725113607.php
+++ b/apps/dav/lib/Migration/Version1011Date20190725113607.php
@@ -27,7 +27,7 @@ declare(strict_types=1);
  */
 namespace OCA\DAV\Migration;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -53,22 +53,22 @@ class Version1011Date20190725113607 extends SimpleMigrationStep {
 			if (!$schema->hasTable($this->getMetadataTableName($type))) {
 				$table = $schema->createTable($this->getMetadataTableName($type));
 
-				$table->addColumn('id', Type::BIGINT, [
+				$table->addColumn('id', Types::BIGINT, [
 					'autoincrement' => true,
 					'notnull' => true,
 					'length' => 11,
 					'unsigned' => true,
 				]);
-				$table->addColumn($type . '_id', Type::BIGINT, [
+				$table->addColumn($type . '_id', Types::BIGINT, [
 					'notnull' => true,
 					'length' => 11,
 					'unsigned' => true,
 				]);
-				$table->addColumn('key', Type::STRING, [
+				$table->addColumn('key', Types::STRING, [
 					'notnull' => true,
 					'length' => 255,
 				]);
-				$table->addColumn('value', Type::STRING, [
+				$table->addColumn('value', Types::STRING, [
 					'notnull' => false,
 					'length' => 4000,
 				]);
diff --git a/apps/dav/lib/Migration/Version1011Date20190806104428.php b/apps/dav/lib/Migration/Version1011Date20190806104428.php
index 7b7a1c5898..e257a36bb6 100644
--- a/apps/dav/lib/Migration/Version1011Date20190806104428.php
+++ b/apps/dav/lib/Migration/Version1011Date20190806104428.php
@@ -28,7 +28,7 @@ declare(strict_types=1);
 namespace OCA\DAV\Migration;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -48,21 +48,21 @@ class Version1011Date20190806104428 extends SimpleMigrationStep {
 		$schema = $schemaClosure();
 
 		$table = $schema->createTable('dav_cal_proxy');
-		$table->addColumn('id', Type::BIGINT, [
+		$table->addColumn('id', Types::BIGINT, [
 			'autoincrement' => true,
 			'notnull' => true,
 			'length' => 11,
 			'unsigned' => true,
 		]);
-		$table->addColumn('owner_id', Type::STRING, [
+		$table->addColumn('owner_id', Types::STRING, [
 			'notnull' => true,
 			'length' => 64,
 		]);
-		$table->addColumn('proxy_id', Type::STRING, [
+		$table->addColumn('proxy_id', Types::STRING, [
 			'notnull' => true,
 			'length' => 64,
 		]);
-		$table->addColumn('permissions', Type::INTEGER, [
+		$table->addColumn('permissions', Types::INTEGER, [
 			'notnull' => false,
 			'length' => 4,
 			'unsigned' => true,
diff --git a/apps/dav/lib/Migration/Version1012Date20190808122342.php b/apps/dav/lib/Migration/Version1012Date20190808122342.php
index 10e891d71a..7aa51a224e 100644
--- a/apps/dav/lib/Migration/Version1012Date20190808122342.php
+++ b/apps/dav/lib/Migration/Version1012Date20190808122342.php
@@ -28,7 +28,7 @@ declare(strict_types=1);
 
 namespace OCA\DAV\Migration;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -54,59 +54,59 @@ class Version1012Date20190808122342 extends SimpleMigrationStep {
 		if (!$schema->hasTable('calendar_reminders')) {
 			$table = $schema->createTable('calendar_reminders');
 
-			$table->addColumn('id', Type::BIGINT, [
+			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 11,
 				'unsigned' => true,
 			]);
-			$table->addColumn('calendar_id', Type::BIGINT, [
+			$table->addColumn('calendar_id', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 11,
 			]);
-			$table->addColumn('object_id', Type::BIGINT, [
+			$table->addColumn('object_id', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 11,
 			]);
-			$table->addColumn('is_recurring', Type::SMALLINT, [
+			$table->addColumn('is_recurring', Types::SMALLINT, [
 				'notnull' => true,
 				'length' => 1,
 			]);
-			$table->addColumn('uid', Type::STRING, [
+			$table->addColumn('uid', Types::STRING, [
 				'notnull' => true,
 				'length' => 255,
 			]);
-			$table->addColumn('recurrence_id', Type::BIGINT, [
+			$table->addColumn('recurrence_id', Types::BIGINT, [
 				'notnull' => false,
 				'length' => 11,
 				'unsigned' => true,
 			]);
-			$table->addColumn('is_recurrence_exception', Type::SMALLINT, [
+			$table->addColumn('is_recurrence_exception', Types::SMALLINT, [
 				'notnull' => true,
 				'length' => 1,
 			]);
-			$table->addColumn('event_hash', Type::STRING, [
+			$table->addColumn('event_hash', Types::STRING, [
 				'notnull' => true,
 				'length' => 255,
 			]);
-			$table->addColumn('alarm_hash', Type::STRING, [
+			$table->addColumn('alarm_hash', Types::STRING, [
 				'notnull' => true,
 				'length' => 255,
 			]);
-			$table->addColumn('type', Type::STRING, [
+			$table->addColumn('type', Types::STRING, [
 				'notnull' => true,
 				'length' => 255,
 			]);
-			$table->addColumn('is_relative', Type::SMALLINT, [
+			$table->addColumn('is_relative', Types::SMALLINT, [
 				'notnull' => true,
 				'length' => 1,
 			]);
-			$table->addColumn('notification_date', Type::BIGINT, [
+			$table->addColumn('notification_date', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 11,
 				'unsigned' => true,
 			]);
-			$table->addColumn('is_repeat_based', Type::SMALLINT, [
+			$table->addColumn('is_repeat_based', Types::SMALLINT, [
 				'notnull' => true,
 				'length' => 1,
 			]);
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index 603a194133..3fd4407f7c 100644
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -42,7 +42,7 @@ use bantu\IniGetWrapper\IniGetWrapper;
 use DirectoryIterator;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Platforms\SqlitePlatform;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use GuzzleHttp\Exception\ClientException;
 use OC;
 use OC\AppFramework\Http;
@@ -634,7 +634,7 @@ Raw output
 				$column = $table->getColumn($columnName);
 				$isAutoIncrement = $column->getAutoincrement();
 				$isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
-				if ($column->getType()->getName() !== Type::BIGINT && !$isAutoIncrementOnSqlite) {
+				if ($column->getType()->getName() !== Types::BIGINT && !$isAutoIncrementOnSqlite) {
 					$pendingColumns[] = $tableName . '.' . $columnName;
 				}
 			}
diff --git a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php
index c7a7e9ffd4..bbc674f7e4 100644
--- a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php
+++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php
@@ -24,7 +24,7 @@
 
 namespace OCA\TwoFactorBackupCodes\Migration;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -44,20 +44,20 @@ class Version1002Date20170607104347 extends SimpleMigrationStep {
 		if (!$schema->hasTable('twofactor_backupcodes')) {
 			$table = $schema->createTable('twofactor_backupcodes');
 
-			$table->addColumn('id', Type::INTEGER, [
+			$table->addColumn('id', Types::INTEGER, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 20,
 			]);
-			$table->addColumn('user_id', Type::STRING, [
+			$table->addColumn('user_id', Types::STRING, [
 				'notnull' => true,
 				'length' => 64,
 			]);
-			$table->addColumn('code', Type::STRING, [
+			$table->addColumn('code', Types::STRING, [
 				'notnull' => true,
 				'length' => 64,
 			]);
-			$table->addColumn('used', Type::INTEGER, [
+			$table->addColumn('used', Types::INTEGER, [
 				'notnull' => true,
 				'length' => 1,
 				'default' => 0,
diff --git a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php
index 93ac316167..c759caf515 100644
--- a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php
+++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php
@@ -25,6 +25,7 @@
 namespace OCA\TwoFactorBackupCodes\Migration;
 
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -47,8 +48,8 @@ class Version1002Date20170919123342 extends SimpleMigrationStep {
 		$column->setDefault('');
 
 		$column = $table->getColumn('used');
-		if ($column->getType()->getName() !== Type::SMALLINT) {
-			$column->setType(Type::getType(Type::SMALLINT));
+		if ($column->getType()->getName() !== Types::SMALLINT) {
+			$column->setType(Type::getType(Types::SMALLINT));
 			$column->setOptions(['length' => 6]);
 		}
 
diff --git a/apps/workflowengine/lib/Migration/Version2000Date20190808074233.php b/apps/workflowengine/lib/Migration/Version2000Date20190808074233.php
index cfbd852d49..fae4fda5bc 100644
--- a/apps/workflowengine/lib/Migration/Version2000Date20190808074233.php
+++ b/apps/workflowengine/lib/Migration/Version2000Date20190808074233.php
@@ -6,7 +6,7 @@ namespace OCA\WorkflowEngine\Migration;
 
 use Closure;
 use Doctrine\DBAL\Schema\Table;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -25,25 +25,25 @@ class Version2000Date20190808074233 extends SimpleMigrationStep {
 
 		if (!$schema->hasTable('flow_checks')) {
 			$table = $schema->createTable('flow_checks');
-			$table->addColumn('id', Type::INTEGER, [
+			$table->addColumn('id', Types::INTEGER, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 4,
 			]);
-			$table->addColumn('class', Type::STRING, [
+			$table->addColumn('class', Types::STRING, [
 				'notnull' => true,
 				'length' => 256,
 				'default' => '',
 			]);
-			$table->addColumn('operator', Type::STRING, [
+			$table->addColumn('operator', Types::STRING, [
 				'notnull' => true,
 				'length' => 16,
 				'default' => '',
 			]);
-			$table->addColumn('value', Type::TEXT, [
+			$table->addColumn('value', Types::TEXT, [
 				'notnull' => false,
 			]);
-			$table->addColumn('hash', Type::STRING, [
+			$table->addColumn('hash', Types::STRING, [
 				'notnull' => true,
 				'length' => 32,
 				'default' => '',
@@ -54,25 +54,25 @@ class Version2000Date20190808074233 extends SimpleMigrationStep {
 
 		if (!$schema->hasTable('flow_operations')) {
 			$table = $schema->createTable('flow_operations');
-			$table->addColumn('id', Type::INTEGER, [
+			$table->addColumn('id', Types::INTEGER, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 4,
 			]);
-			$table->addColumn('class', Type::STRING, [
+			$table->addColumn('class', Types::STRING, [
 				'notnull' => true,
 				'length' => 256,
 				'default' => '',
 			]);
-			$table->addColumn('name', Type::STRING, [
+			$table->addColumn('name', Types::STRING, [
 				'notnull' => true,
 				'length' => 256,
 				'default' => '',
 			]);
-			$table->addColumn('checks', Type::TEXT, [
+			$table->addColumn('checks', Types::TEXT, [
 				'notnull' => false,
 			]);
-			$table->addColumn('operation', Type::TEXT, [
+			$table->addColumn('operation', Types::TEXT, [
 				'notnull' => false,
 			]);
 			$this->ensureEntityColumns($table);
@@ -84,22 +84,22 @@ class Version2000Date20190808074233 extends SimpleMigrationStep {
 
 		if (!$schema->hasTable('flow_operations_scope')) {
 			$table = $schema->createTable('flow_operations_scope');
-			$table->addColumn('id', Type::BIGINT, [
+			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 4,
 			]);
-			$table->addColumn('operation_id', Type::INTEGER, [
+			$table->addColumn('operation_id', Types::INTEGER, [
 				'notnull' => true,
 				'length' => 4,
 				'default' => 0,
 			]);
-			$table->addColumn('type', Type::INTEGER, [
+			$table->addColumn('type', Types::INTEGER, [
 				'notnull' => true,
 				'length' => 4,
 				'default' => 0,
 			]);
-			$table->addColumn('value', Type::STRING, [
+			$table->addColumn('value', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 				'default' => '',
@@ -113,14 +113,14 @@ class Version2000Date20190808074233 extends SimpleMigrationStep {
 
 	protected function ensureEntityColumns(Table $table) {
 		if (!$table->hasColumn('entity')) {
-			$table->addColumn('entity', Type::STRING, [
+			$table->addColumn('entity', Types::STRING, [
 				'notnull' => true,
 				'length' => 256,
 				'default' => '',
 			]);
 		}
 		if (!$table->hasColumn('events')) {
-			$table->addColumn('events', Type::TEXT, [
+			$table->addColumn('events', Types::TEXT, [
 				'notnull' => true,
 				'default' => '[]',
 			]);
diff --git a/core/Command/Db/ConvertFilecacheBigInt.php b/core/Command/Db/ConvertFilecacheBigInt.php
index f65e76ddfc..99ff3327f8 100644
--- a/core/Command/Db/ConvertFilecacheBigInt.php
+++ b/core/Command/Db/ConvertFilecacheBigInt.php
@@ -29,6 +29,7 @@ namespace OC\Core\Command\Db;
 
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OC\DB\SchemaWrapper;
 use OCP\IDBConnection;
 use Symfony\Component\Console\Command\Command;
@@ -88,8 +89,8 @@ class ConvertFilecacheBigInt extends Command {
 				$column = $table->getColumn($columnName);
 				$isAutoIncrement = $column->getAutoincrement();
 				$isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
-				if ($column->getType()->getName() !== Type::BIGINT && !$isAutoIncrementOnSqlite) {
-					$column->setType(Type::getType(Type::BIGINT));
+				if ($column->getType()->getName() !== Types::BIGINT && !$isAutoIncrementOnSqlite) {
+					$column->setType(Type::getType(Types::BIGINT));
 					$column->setOptions(['length' => 20]);
 
 					$updates[] = '* ' . $tableName . '.' . $columnName;
diff --git a/core/Migrations/Version13000Date20170705121758.php b/core/Migrations/Version13000Date20170705121758.php
index 21abebf158..c416fd24a4 100644
--- a/core/Migrations/Version13000Date20170705121758.php
+++ b/core/Migrations/Version13000Date20170705121758.php
@@ -24,7 +24,7 @@
 
 namespace OC\Core\Migrations;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -44,15 +44,15 @@ class Version13000Date20170705121758 extends SimpleMigrationStep {
 		if (!$schema->hasTable('personal_sections')) {
 			$table = $schema->createTable('personal_sections');
 
-			$table->addColumn('id', Type::STRING, [
+			$table->addColumn('id', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 			]);
-			$table->addColumn('class', Type::STRING, [
+			$table->addColumn('class', Types::STRING, [
 				'notnull' => true,
 				'length' => 255,
 			]);
-			$table->addColumn('priority', Type::INTEGER, [
+			$table->addColumn('priority', Types::INTEGER, [
 				'notnull' => true,
 				'length' => 6,
 				'default' => 0,
@@ -65,20 +65,20 @@ class Version13000Date20170705121758 extends SimpleMigrationStep {
 		if (!$schema->hasTable('personal_settings')) {
 			$table = $schema->createTable('personal_settings');
 
-			$table->addColumn('id', Type::INTEGER, [
+			$table->addColumn('id', Types::INTEGER, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 20,
 			]);
-			$table->addColumn('class', Type::STRING, [
+			$table->addColumn('class', Types::STRING, [
 				'notnull' => true,
 				'length' => 255,
 			]);
-			$table->addColumn('section', Type::STRING, [
+			$table->addColumn('section', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 			]);
-			$table->addColumn('priority', Type::INTEGER, [
+			$table->addColumn('priority', Types::INTEGER, [
 				'notnull' => true,
 				'length' => 6,
 				'default' => 0,
diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php
index 7e48059f79..e150a747d0 100644
--- a/core/Migrations/Version13000Date20170718121200.php
+++ b/core/Migrations/Version13000Date20170718121200.php
@@ -28,7 +28,7 @@
 
 namespace OC\Core\Migrations;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -72,7 +72,7 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 				'notnull' => false,
 				'length' => 64,
 			]);
-			$table->addColumn('numeric_id', Type::BIGINT, [
+			$table->addColumn('numeric_id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 20,
@@ -95,11 +95,11 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 				'notnull' => true,
 				'length' => 4,
 			]);
-			$table->addColumn('storage_id', Type::BIGINT, [
+			$table->addColumn('storage_id', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 			]);
-			$table->addColumn('root_id', Type::BIGINT, [
+			$table->addColumn('root_id', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 			]);
@@ -111,7 +111,7 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 				'notnull' => true,
 				'length' => 4000,
 			]);
-			$table->addColumn('mount_id', Type::BIGINT, [
+			$table->addColumn('mount_id', Types::BIGINT, [
 				'notnull' => false,
 				'length' => 20,
 			]);
@@ -125,7 +125,7 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 
 		if (!$schema->hasTable('mimetypes')) {
 			$table = $schema->createTable('mimetypes');
-			$table->addColumn('id', Type::BIGINT, [
+			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 20,
@@ -141,12 +141,12 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 
 		if (!$schema->hasTable('filecache')) {
 			$table = $schema->createTable('filecache');
-			$table->addColumn('fileid', Type::BIGINT, [
+			$table->addColumn('fileid', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 20,
 			]);
-			$table->addColumn('storage', Type::BIGINT, [
+			$table->addColumn('storage', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 				'default' => 0,
@@ -160,7 +160,7 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 				'length' => 32,
 				'default' => '',
 			]);
-			$table->addColumn('parent', Type::BIGINT, [
+			$table->addColumn('parent', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 				'default' => 0,
@@ -169,12 +169,12 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 				'notnull' => false,
 				'length' => 250,
 			]);
-			$table->addColumn('mimetype', Type::BIGINT, [
+			$table->addColumn('mimetype', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 				'default' => 0,
 			]);
-			$table->addColumn('mimepart', Type::BIGINT, [
+			$table->addColumn('mimepart', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 				'default' => 0,
@@ -184,12 +184,12 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 				'length' => 8,
 				'default' => 0,
 			]);
-			$table->addColumn('mtime', Type::BIGINT, [
+			$table->addColumn('mtime', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 				'default' => 0,
 			]);
-			$table->addColumn('storage_mtime', Type::BIGINT, [
+			$table->addColumn('storage_mtime', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 				'default' => 0,
diff --git a/core/Migrations/Version14000Date20180710092004.php b/core/Migrations/Version14000Date20180710092004.php
index f44dbf4240..525836f931 100644
--- a/core/Migrations/Version14000Date20180710092004.php
+++ b/core/Migrations/Version14000Date20180710092004.php
@@ -27,7 +27,7 @@ declare(strict_types=1);
 
 namespace OC\Core\Migrations;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -40,7 +40,7 @@ class Version14000Date20180710092004 extends SimpleMigrationStep {
 		$table = $schema->getTable('share');
 
 		if (!$table->hasColumn('password_by_talk')) {
-			$table->addColumn('password_by_talk', Type::BOOLEAN, [
+			$table->addColumn('password_by_talk', Types::BOOLEAN, [
 				'default' => 0,
 			]);
 		}
diff --git a/core/Migrations/Version16000Date20190207141427.php b/core/Migrations/Version16000Date20190207141427.php
index 1b5777a921..52511a8e32 100644
--- a/core/Migrations/Version16000Date20190207141427.php
+++ b/core/Migrations/Version16000Date20190207141427.php
@@ -28,7 +28,7 @@ declare(strict_types=1);
 namespace OC\Core\Migrations;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -49,11 +49,11 @@ class Version16000Date20190207141427 extends SimpleMigrationStep {
 		if (!$schema->hasTable('collres_collections')) {
 			$table = $schema->createTable('collres_collections');
 
-			$table->addColumn('id', Type::BIGINT, [
+			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 			]);
-			$table->addColumn('name', Type::STRING, [
+			$table->addColumn('name', Types::STRING, [
 				'notnull' => true,
 				'length' => 64,
 			]);
@@ -64,14 +64,14 @@ class Version16000Date20190207141427 extends SimpleMigrationStep {
 		if (!$schema->hasTable('collres_resources')) {
 			$table = $schema->createTable('collres_resources');
 
-			$table->addColumn('collection_id', Type::BIGINT, [
+			$table->addColumn('collection_id', Types::BIGINT, [
 				'notnull' => true,
 			]);
-			$table->addColumn('resource_type', Type::STRING, [
+			$table->addColumn('resource_type', Types::STRING, [
 				'notnull' => true,
 				'length' => 64,
 			]);
-			$table->addColumn('resource_id', Type::STRING, [
+			$table->addColumn('resource_id', Types::STRING, [
 				'notnull' => true,
 				'length' => 64,
 			]);
@@ -82,25 +82,25 @@ class Version16000Date20190207141427 extends SimpleMigrationStep {
 		if (!$schema->hasTable('collres_accesscache')) {
 			$table = $schema->createTable('collres_accesscache');
 
-			$table->addColumn('user_id', Type::STRING, [
+			$table->addColumn('user_id', Types::STRING, [
 				'notnull' => true,
 				'length' => 64,
 			]);
-			$table->addColumn('collection_id', Type::BIGINT, [
+			$table->addColumn('collection_id', Types::BIGINT, [
 				'notnull' => false,
 				'default' => 0,
 			]);
-			$table->addColumn('resource_type', Type::STRING, [
+			$table->addColumn('resource_type', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 				'default' => '',
 			]);
-			$table->addColumn('resource_id', Type::STRING, [
+			$table->addColumn('resource_id', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 				'default' => '',
 			]);
-			$table->addColumn('access', Type::SMALLINT, [
+			$table->addColumn('access', Types::SMALLINT, [
 				'notnull' => true,
 				'default' => 0,
 			]);
diff --git a/core/Migrations/Version16000Date20190212081545.php b/core/Migrations/Version16000Date20190212081545.php
index 71ad253453..86494db479 100644
--- a/core/Migrations/Version16000Date20190212081545.php
+++ b/core/Migrations/Version16000Date20190212081545.php
@@ -29,7 +29,7 @@ declare(strict_types=1);
 namespace OC\Core\Migrations;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -47,52 +47,52 @@ class Version16000Date20190212081545 extends SimpleMigrationStep {
 		$schema = $schemaClosure();
 
 		$table = $schema->createTable('login_flow_v2');
-		$table->addColumn('id', Type::BIGINT, [
+		$table->addColumn('id', Types::BIGINT, [
 			'autoincrement' => true,
 			'notnull' => true,
 			'length' => 20,
 			'unsigned' => true,
 		]);
-		$table->addColumn('timestamp', Type::BIGINT, [
+		$table->addColumn('timestamp', Types::BIGINT, [
 			'notnull' => true,
 			'length' => 20,
 			'unsigned' => true,
 		]);
-		$table->addColumn('started', Type::SMALLINT, [
+		$table->addColumn('started', Types::SMALLINT, [
 			'notnull' => true,
 			'length' => 1,
 			'unsigned' => true,
 			'default' => 0,
 		]);
-		$table->addColumn('poll_token', Type::STRING, [
+		$table->addColumn('poll_token', Types::STRING, [
 			'notnull' => true,
 			'length' => 255,
 		]);
-		$table->addColumn('login_token', Type::STRING, [
+		$table->addColumn('login_token', Types::STRING, [
 			'notnull' => true,
 			'length' => 255,
 		]);
-		$table->addColumn('public_key', Type::TEXT, [
+		$table->addColumn('public_key', Types::TEXT, [
 			'notnull' => true,
 			'length' => 32768,
 		]);
-		$table->addColumn('private_key', Type::TEXT, [
+		$table->addColumn('private_key', Types::TEXT, [
 			'notnull' => true,
 			'length' => 32768,
 		]);
-		$table->addColumn('client_name', Type::STRING, [
+		$table->addColumn('client_name', Types::STRING, [
 			'notnull' => true,
 			'length' => 255,
 		]);
-		$table->addColumn('login_name', Type::STRING, [
+		$table->addColumn('login_name', Types::STRING, [
 			'notnull' => false,
 			'length' => 255,
 		]);
-		$table->addColumn('server', Type::STRING, [
+		$table->addColumn('server', Types::STRING, [
 			'notnull' => false,
 			'length' => 255,
 		]);
-		$table->addColumn('app_password', Type::STRING, [
+		$table->addColumn('app_password', Types::STRING, [
 			'notnull' => false,
 			'length' => 1024,
 		]);
diff --git a/core/Migrations/Version16000Date20190428150708.php b/core/Migrations/Version16000Date20190428150708.php
index 4e61dfd6be..546d4c19e1 100644
--- a/core/Migrations/Version16000Date20190428150708.php
+++ b/core/Migrations/Version16000Date20190428150708.php
@@ -28,7 +28,7 @@ declare(strict_types=1);
 namespace OC\Core\Migrations;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -48,7 +48,7 @@ class Version16000Date20190428150708 extends SimpleMigrationStep {
 
 		if ($schema->hasTable('collres_accesscache')) {
 			$table = $schema->getTable('collres_accesscache');
-			$table->addColumn('access', Type::BOOLEAN, [
+			$table->addColumn('access', Types::BOOLEAN, [
 				'notnull' => true,
 				'default' => false
 			]);
diff --git a/core/Migrations/Version17000Date20190514105811.php b/core/Migrations/Version17000Date20190514105811.php
index 994e85e062..49dbb1ad1b 100644
--- a/core/Migrations/Version17000Date20190514105811.php
+++ b/core/Migrations/Version17000Date20190514105811.php
@@ -30,7 +30,7 @@ declare(strict_types=1);
 namespace OC\Core\Migrations;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -48,21 +48,21 @@ class Version17000Date20190514105811 extends SimpleMigrationStep {
 		$schema = $schemaClosure();
 		if (!$schema->hasTable('filecache_extended')) {
 			$table = $schema->createTable('filecache_extended');
-			$table->addColumn('fileid', Type::BIGINT, [
+			$table->addColumn('fileid', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 4,
 				'unsigned' => true,
 			]);
-			$table->addColumn('metadata_etag', Type::STRING, [
+			$table->addColumn('metadata_etag', Types::STRING, [
 				'notnull' => false,
 				'length' => 40,
 			]);
-			$table->addColumn('creation_time', Type::BIGINT, [
+			$table->addColumn('creation_time', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 				'default' => 0,
 			]);
-			$table->addColumn('upload_time', Type::BIGINT, [
+			$table->addColumn('upload_time', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 				'default' => 0,
diff --git a/core/Migrations/Version18000Date20190920085628.php b/core/Migrations/Version18000Date20190920085628.php
index a5ade011cc..2f7859601f 100644
--- a/core/Migrations/Version18000Date20190920085628.php
+++ b/core/Migrations/Version18000Date20190920085628.php
@@ -28,7 +28,7 @@ declare(strict_types=1);
 namespace OC\Core\Migrations;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
@@ -56,7 +56,7 @@ class Version18000Date20190920085628 extends SimpleMigrationStep {
 		if ($schema->hasTable('groups')) {
 			$table = $schema->getTable('groups');
 
-			$table->addColumn('displayname', Type::STRING, [
+			$table->addColumn('displayname', Types::STRING, [
 				'notnull' => true,
 				'length' => 255,
 				'default' => '',
diff --git a/core/Migrations/Version18000Date20191014105105.php b/core/Migrations/Version18000Date20191014105105.php
index 62a8e2cc37..84c797cc57 100644
--- a/core/Migrations/Version18000Date20191014105105.php
+++ b/core/Migrations/Version18000Date20191014105105.php
@@ -27,7 +27,7 @@ declare(strict_types=1);
 namespace OC\Core\Migrations;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
 use OCP\Migration\SimpleMigrationStep;
@@ -53,34 +53,34 @@ class Version18000Date20191014105105 extends SimpleMigrationStep {
 		$schema = $schemaClosure();
 		$table = $schema->createTable('direct_edit');
 
-		$table->addColumn('id', Type::BIGINT, [
+		$table->addColumn('id', Types::BIGINT, [
 			'autoincrement' => true,
 			'notnull' => true,
 		]);
-		$table->addColumn('editor_id', Type::STRING, [
+		$table->addColumn('editor_id', Types::STRING, [
 			'notnull' => true,
 			'length' => 64,
 		]);
-		$table->addColumn('token', Type::STRING, [
+		$table->addColumn('token', Types::STRING, [
 			'notnull' => true,
 			'length' => 64,
 		]);
-		$table->addColumn('file_id', Type::BIGINT, [
+		$table->addColumn('file_id', Types::BIGINT, [
 			'notnull' => true,
 		]);
-		$table->addColumn('user_id', Type::STRING, [
+		$table->addColumn('user_id', Types::STRING, [
 			'notnull' => false,
 			'length' => 64,
 		]);
-		$table->addColumn('share_id', Type::BIGINT, [
+		$table->addColumn('share_id', Types::BIGINT, [
 			'notnull' => false
 		]);
-		$table->addColumn('timestamp', Type::BIGINT, [
+		$table->addColumn('timestamp', Types::BIGINT, [
 			'notnull' => true,
 			'length' => 20,
 			'unsigned' => true,
 		]);
-		$table->addColumn('accessed', Type::BOOLEAN, [
+		$table->addColumn('accessed', Types::BOOLEAN, [
 			'notnull' => true,
 			'default' => false
 		]);
diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php
index 6685c1917f..62f1d731f5 100644
--- a/lib/private/DB/MigrationService.php
+++ b/lib/private/DB/MigrationService.php
@@ -34,7 +34,7 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Schema\Sequence;
 use Doctrine\DBAL\Schema\Table;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OC\App\InfoParser;
 use OC\IntegrityCheck\Helpers\AppLocator;
 use OC\Migration\SimpleOutput;
@@ -165,8 +165,8 @@ class MigrationService {
 		}
 
 		$table = $schema->createTable('migrations');
-		$table->addColumn('app', Type::STRING, ['length' => 255]);
-		$table->addColumn('version', Type::STRING, ['length' => 255]);
+		$table->addColumn('app', Types::STRING, ['length' => 255]);
+		$table->addColumn('version', Types::STRING, ['length' => 255]);
 		$table->setPrimaryKey(['app', 'version']);
 
 		$this->connection->migrateToSchema($schema->getWrappedSchema());
diff --git a/lib/public/Migration/BigIntMigration.php b/lib/public/Migration/BigIntMigration.php
index 251b7a908d..cf08acd838 100644
--- a/lib/public/Migration/BigIntMigration.php
+++ b/lib/public/Migration/BigIntMigration.php
@@ -24,6 +24,7 @@
 namespace OCP\Migration;
 
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 
 /**
@@ -56,8 +57,8 @@ abstract class BigIntMigration extends SimpleMigrationStep {
 
 			foreach ($columns as $columnName) {
 				$column = $table->getColumn($columnName);
-				if ($column->getType()->getName() !== Type::BIGINT) {
-					$column->setType(Type::getType(Type::BIGINT));
+				if ($column->getType()->getName() !== Types::BIGINT) {
+					$column->setType(Type::getType(Types::BIGINT));
 					$column->setOptions(['length' => 20]);
 				}
 			}
diff --git a/tests/lib/DB/OCPostgreSqlPlatformTest.php b/tests/lib/DB/OCPostgreSqlPlatformTest.php
index 0821a988eb..62a2fc3471 100644
--- a/tests/lib/DB/OCPostgreSqlPlatformTest.php
+++ b/tests/lib/DB/OCPostgreSqlPlatformTest.php
@@ -24,7 +24,7 @@ namespace Test\DB;
 use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
 use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 
 /**
  * Class OCPostgreSqlPlatformTest
@@ -42,8 +42,8 @@ class OCPostgreSqlPlatformTest extends \Test\TestCase {
 		$sourceSchema = new Schema();
 		$targetSchema = new Schema();
 
-		$this->createTableAndColumn($sourceSchema, Type::INTEGER);
-		$this->createTableAndColumn($targetSchema, Type::BIGINT);
+		$this->createTableAndColumn($sourceSchema, Types::INTEGER);
+		$this->createTableAndColumn($targetSchema, Types::BIGINT);
 
 		$comparator = new Comparator();
 		$diff = $comparator->compare($sourceSchema, $targetSchema);