diff --git a/api/inc/class.egw_exception_db.inc.php b/api/inc/class.egw_exception_db.inc.php
index 30893263b7..7bef12a383 100644
--- a/api/inc/class.egw_exception_db.inc.php
+++ b/api/inc/class.egw_exception_db.inc.php
@@ -14,7 +14,7 @@
 use EGroupware\Api;
 
 /**
- * Exception thrown by the egw_db class for everything not covered by extended classed below
+ * Exception thrown by the Api\Db class for everything not covered by extended classed below
  *
  * New Db\Exception has to extend deprecated egw_exception_db to allow legacy code
  * to catch exceptions thrown by Api\Db class!
diff --git a/api/src/Config.php b/api/src/Config.php
index fdc59e776c..5b1654d755 100755
--- a/api/src/Config.php
+++ b/api/src/Config.php
@@ -332,8 +332,8 @@ class Config
 	 */
 	public static function init_static()
 	{
-		// we use a reference here (no clone), as we no longer use egw_db::row() or egw_db::next_record()!
-		if (isset($GLOBALS['egw_setup']) && is_a($GLOBALS['egw_setup']->db, 'egw_db'))
+		// we use a reference here (no clone), as we no longer use Db::row() or Db::next_record()!
+		if (isset($GLOBALS['egw_setup']) && $GLOBALS['egw_setup']->db instanceof Db)
 		{
 			self::$db = $GLOBALS['egw_setup']->db;
 		}
diff --git a/api/src/Contacts.php b/api/src/Contacts.php
index d950f7fce7..794a6c6872 100755
--- a/api/src/Contacts.php
+++ b/api/src/Contacts.php
@@ -163,9 +163,9 @@ class Contacts extends Contacts\Storage
 	 * Constructor
 	 *
 	 * @param string $contact_app ='addressbook' used for acl->get_grants()
-	 * @param egw_db $db =null
+	 * @param Db $db =null
 	 */
-	function __construct($contact_app='addressbook',egw_db $db=null)
+	function __construct($contact_app='addressbook',Db $db=null)
 	{
 		parent::__construct($contact_app,$db);
 		if ($this->log)
@@ -1549,7 +1549,7 @@ class Contacts extends Contacts\Storage
 			$options['filter'] = (array)$options['filter'];
 		}
 		// return only contacts with email set
-		$options['filter'][] = "contact_email ".$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE]." '%@%'";
+		$options['filter'][] = "contact_email ".$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE]." '%@%'";
 
 		// let link query know, to append email to list
 		$options['type'] = 'email';
diff --git a/api/src/Db/Backup.php b/api/src/Db/Backup.php
index c91a615f81..3a3e8053a3 100644
--- a/api/src/Db/Backup.php
+++ b/api/src/Db/Backup.php
@@ -87,7 +87,7 @@ class Backup
 	 */
 	var $backup_files = false ;
 	/**
-	 * Reference to schema_proc's egw_db object
+	 * Reference to schema_proc's Api\Db object
 	 *
 	 * @var Api\Db
 	 */
diff --git a/api/src/Db/Exception.php b/api/src/Db/Exception.php
index 2de481eaa7..3d3e906af9 100644
--- a/api/src/Db/Exception.php
+++ b/api/src/Db/Exception.php
@@ -14,7 +14,7 @@
 namespace EGroupware\Api\Db;
 
 /**
- * Exception thrown by the egw_db class for everything not covered by extended classed below
+ * Exception thrown by the Api\Db class for everything not covered by extended classed below
  *
  * New Db\Exception has to extend deprecated egw_exception_db to allow legacy code
  * to catch exceptions thrown by Api\Db class!
diff --git a/api/src/Db/Schema.php b/api/src/Db/Schema.php
index a528a42883..af99f9e439 100644
--- a/api/src/Db/Schema.php
+++ b/api/src/Db/Schema.php
@@ -916,7 +916,7 @@ class Schema
 	 */
 	function ExecuteSqlArray($aSql,$debug_level)
 	{
-		if ($this->m_odb->query_log)	// we use egw_db::query to log the queries
+		if ($this->m_odb->query_log)	// we use Db::query to log the queries
 		{
 			$retval = 2;
 			foreach($aSql as $sql)
diff --git a/api/src/Egw/Applications.php b/api/src/Egw/Applications.php
index dd3c08bf71..1908aae9d3 100755
--- a/api/src/Egw/Applications.php
+++ b/api/src/Egw/Applications.php
@@ -23,7 +23,7 @@ class Applications
 	/**
 	 * Reference to the global db class
 	 *
-	 * @var egw_db
+	 * @var EGroupware\Api\Db
 	 */
 	var $db;
 	var $table_name = 'egw_applications';
diff --git a/api/src/Link/Storage.php b/api/src/Link/Storage.php
index c3b8175b42..c1d7858d64 100644
--- a/api/src/Link/Storage.php
+++ b/api/src/Link/Storage.php
@@ -39,7 +39,7 @@ class Storage
 	/**
 	 * Reference to the global db-class
 	 *
-	 * @var egw_db
+	 * @var Api\Db
 	 */
 	private static $db;
 	/**
diff --git a/api/src/Preferences.php b/api/src/Preferences.php
index b04c117ce9..c9ce6286b4 100644
--- a/api/src/Preferences.php
+++ b/api/src/Preferences.php
@@ -86,7 +86,7 @@ class Preferences
 	 */
 	var $session = array();
 	/**
-	 * @var egw_db
+	 * @var Db
 	 */
 	var $db;
 	/**
diff --git a/api/src/Session.php b/api/src/Session.php
index af7ffc6064..73b94c6724 100644
--- a/api/src/Session.php
+++ b/api/src/Session.php
@@ -54,7 +54,7 @@ class Session
 	/**
 	 * key of eGW's required files in $_SESSION
 	 *
-	 * These files get set by egw_db and egw class, for classes which get not autoloaded (eg. ADOdb, idots_framework)
+	 * These files get set by Db and Egw class, for classes which get not autoloaded (eg. ADOdb, idots_framework)
 	 */
 	const EGW_REQUIRED_FILES = 'egw_required_files';
 
diff --git a/api/src/Storage/Customfields.php b/api/src/Storage/Customfields.php
index 0c7989176d..1f83b27a17 100755
--- a/api/src/Storage/Customfields.php
+++ b/api/src/Storage/Customfields.php
@@ -59,10 +59,10 @@ class Customfields implements \IteratorAggregate
 	 * @param string $only_type2 =null if given only return fields of type2 == $only_type2
 	 * @param int $start =0
 	 * @param int $num_rows =null
-	 * @param egw_db $db =null reference to database instance to use
+	 * @param Api\Db $db =null reference to database instance to use
 	 * @return array with customfields
 	 */
-	function __construct($app, $all_private_too=false, $only_type2=null, $start=0, $num_rows=null, egw_db $db=null)
+	function __construct($app, $all_private_too=false, $only_type2=null, $start=0, $num_rows=null, Api\Db $db=null)
 	{
 		$this->app = $app;
 		$this->all_private_too = $all_private_too;
@@ -88,7 +88,7 @@ class Customfields implements \IteratorAggregate
 	/**
 	 * Return iterator required for IteratorAggregate
 	 *
-	 * @return egw_db_callback_iterator
+	 * @return Api\Db\CallbackIterator
 	 */
 	function getIterator()
 	{
@@ -129,10 +129,10 @@ class Customfields implements \IteratorAggregate
 	 * @param string $app
 	 * @param boolean $all_private_too =false should all the private fields be returned too, default no
 	 * @param string $only_type2 =null if given only return fields of type2 == $only_type2
-	 * @param egw_db $db =null reference to database to use
+	 * @param Api\Db $db =null reference to database to use
 	 * @return array with customfields
 	 */
-	public static function get($app, $all_private_too=false, $only_type2=null, egw_db $db=null)
+	public static function get($app, $all_private_too=false, $only_type2=null, Api\Db $db=null)
 	{
 		$cache_key = $app.':'.($all_private_too?'all':$GLOBALS['egw_info']['user']['account_id']).':'.$only_type2;
 		$cfs = Api\Cache::getInstance(__CLASS__, $cache_key);
diff --git a/api/src/Vfs/Sharing.php b/api/src/Vfs/Sharing.php
index 9585b733b7..f2da5526c8 100644
--- a/api/src/Vfs/Sharing.php
+++ b/api/src/Vfs/Sharing.php
@@ -52,7 +52,7 @@ class Sharing
 	/**
 	 * Reference to global db object
 	 *
-	 * @var egw_db
+	 * @var Api\Db
 	 */
 	protected static $db;