diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php
index 033e61fb..f5194be0 100644
--- a/dibi/drivers/mssql.php
+++ b/dibi/drivers/mssql.php
@@ -48,7 +48,7 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 * Resultset resource.
 	 * @var resource
 	 */
-	private $resultset;
+	private $resultSet;
 
 
 
@@ -114,13 +114,13 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function query($sql)
 	{
-		$this->resultset = @mssql_query($sql, $this->connection); // intentionally @
+		$this->resultSet = @mssql_query($sql, $this->connection); // intentionally @
 
-		if ($this->resultset === FALSE) {
+		if ($this->resultSet === FALSE) {
 			throw new DibiDriverException('Query error', 0, $sql);
 		}
 
-		return is_resource($this->resultset) ? clone $this : NULL;
+		return is_resource($this->resultSet) ? clone $this : NULL;
 	}
 
 
@@ -220,7 +220,7 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Decodes data from resultset.
+	 * Decodes data from result set.
 	 *
 	 * @param  string    value
 	 * @param  string    type (dibi::FIELD_BINARY)
@@ -263,7 +263,7 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function rowCount()
 	{
-		return mssql_num_rows($this->resultset);
+		return mssql_num_rows($this->resultSet);
 	}
 
 
@@ -277,7 +277,7 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function fetch($type)
 	{
-		return mssql_fetch_array($this->resultset, $type ? MSSQL_ASSOC : MSSQL_NUM);
+		return mssql_fetch_array($this->resultSet, $type ? MSSQL_ASSOC : MSSQL_NUM);
 	}
 
 
@@ -291,7 +291,7 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function seek($row)
 	{
-		return mssql_data_seek($this->resultset, $row);
+		return mssql_data_seek($this->resultSet, $row);
 	}
 
 
@@ -303,8 +303,8 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function free()
 	{
-		mssql_free_result($this->resultset);
-		$this->resultset = NULL;
+		mssql_free_result($this->resultSet);
+		$this->resultSet = NULL;
 	}
 
 
@@ -316,11 +316,11 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function getColumnsMeta()
 	{
-		$count = mssql_num_fields($this->resultset);
+		$count = mssql_num_fields($this->resultSet);
 		$meta = array();
 		for ($i = 0; $i < $count; $i++) {
 			// items 'name' and 'table' are required
-			$info = (array) mssql_fetch_field($this->resultset, $i);
+			$info = (array) mssql_fetch_field($this->resultSet, $i);
 			$info['table'] = $info['column_source'];
 			$meta[] = $info;
 		}
@@ -342,13 +342,13 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Returns the resultset resource.
+	 * Returns the result set resource.
 	 *
 	 * @return mixed
 	 */
 	public function getResultResource()
 	{
-		return $this->resultset;
+		return $this->resultSet;
 	}
 
 
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index d0ae5cc8..0490e5b9 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -54,7 +54,7 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 * Resultset resource.
 	 * @var resource
 	 */
-	private $resultset;
+	private $resultSet;
 
 
 	/**
@@ -164,16 +164,16 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver
 	public function query($sql)
 	{
 		if ($this->buffered) {
-			$this->resultset = @mysql_query($sql, $this->connection); // intentionally @
+			$this->resultSet = @mysql_query($sql, $this->connection); // intentionally @
 		} else {
-			$this->resultset = @mysql_unbuffered_query($sql, $this->connection); // intentionally @
+			$this->resultSet = @mysql_unbuffered_query($sql, $this->connection); // intentionally @
 		}
 
 		if (mysql_errno($this->connection)) {
 			$this->throwException($sql);
 		}
 
-		return is_resource($this->resultset) ? clone $this : NULL;
+		return is_resource($this->resultSet) ? clone $this : NULL;
 	}
 
 
@@ -273,7 +273,7 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Decodes data from resultset.
+	 * Decodes data from result set.
 	 *
 	 * @param  string    value
 	 * @param  string    type (dibi::FIELD_BINARY)
@@ -316,7 +316,7 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver
 		if (!$this->buffered) {
 			throw new DibiDriverException('Row count is not available for unbuffered queries.');
 		}
-		return mysql_num_rows($this->resultset);
+		return mysql_num_rows($this->resultSet);
 	}
 
 
@@ -330,7 +330,7 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function fetch($type)
 	{
-		return mysql_fetch_array($this->resultset, $type ? MYSQL_ASSOC : MYSQL_NUM);
+		return mysql_fetch_array($this->resultSet, $type ? MYSQL_ASSOC : MYSQL_NUM);
 	}
 
 
@@ -348,7 +348,7 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver
 			throw new DibiDriverException('Cannot seek an unbuffered result set.');
 		}
 
-		return mysql_data_seek($this->resultset, $row);
+		return mysql_data_seek($this->resultSet, $row);
 	}
 
 
@@ -360,8 +360,8 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function free()
 	{
-		mysql_free_result($this->resultset);
-		$this->resultset = NULL;
+		mysql_free_result($this->resultSet);
+		$this->resultSet = NULL;
 	}
 
 
@@ -373,11 +373,11 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function getColumnsMeta()
 	{
-		$count = mysql_num_fields($this->resultset);
+		$count = mysql_num_fields($this->resultSet);
 		$meta = array();
 		for ($i = 0; $i < $count; $i++) {
 			// items 'name' and 'table' are required
-			$meta[] = (array) mysql_fetch_field($this->resultset, $i);
+			$meta[] = (array) mysql_fetch_field($this->resultSet, $i);
 		}
 		return $meta;
 	}
@@ -409,13 +409,13 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Returns the resultset resource.
+	 * Returns the result set resource.
 	 *
 	 * @return mixed
 	 */
 	public function getResultResource()
 	{
-		return $this->resultset;
+		return $this->resultSet;
 	}
 
 
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index f6dd4b26..00b397cd 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -54,7 +54,7 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver
 	 * Resultset resource.
 	 * @var mysqli_result
 	 */
-	private $resultset;
+	private $resultSet;
 
 
 	/**
@@ -147,13 +147,13 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function query($sql)
 	{
-		$this->resultset = @mysqli_query($this->connection, $sql, $this->buffered ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT); // intentionally @
+		$this->resultSet = @mysqli_query($this->connection, $sql, $this->buffered ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT); // intentionally @
 
 		if (mysqli_errno($this->connection)) {
 			$this->throwException($sql);
 		}
 
-		return is_object($this->resultset) ? clone $this : NULL;
+		return is_object($this->resultSet) ? clone $this : NULL;
 	}
 
 
@@ -253,7 +253,7 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Decodes data from resultset.
+	 * Decodes data from result set.
 	 *
 	 * @param  string    value
 	 * @param  string    type (dibi::FIELD_BINARY)
@@ -296,7 +296,7 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver
 		if (!$this->buffered) {
 			throw new DibiDriverException('Row count is not available for unbuffered queries.');
 		}
-		return mysqli_num_rows($this->resultset);
+		return mysqli_num_rows($this->resultSet);
 	}
 
 
@@ -310,7 +310,7 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function fetch($type)
 	{
-		return mysqli_fetch_array($this->resultset, $type ? MYSQLI_ASSOC : MYSQLI_NUM);
+		return mysqli_fetch_array($this->resultSet, $type ? MYSQLI_ASSOC : MYSQLI_NUM);
 	}
 
 
@@ -327,7 +327,7 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver
 		if (!$this->buffered) {
 			throw new DibiDriverException('Cannot seek an unbuffered result set.');
 		}
-		return mysqli_data_seek($this->resultset, $row);
+		return mysqli_data_seek($this->resultSet, $row);
 	}
 
 
@@ -339,8 +339,8 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function free()
 	{
-		mysqli_free_result($this->resultset);
-		$this->resultset = NULL;
+		mysqli_free_result($this->resultSet);
+		$this->resultSet = NULL;
 	}
 
 
@@ -352,11 +352,11 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function getColumnsMeta()
 	{
-		$count = mysqli_num_fields($this->resultset);
+		$count = mysqli_num_fields($this->resultSet);
 		$meta = array();
 		for ($i = 0; $i < $count; $i++) {
 			// items 'name' and 'table' are required
-			$meta[] = (array) mysqli_fetch_field_direct($this->resultset, $i);
+			$meta[] = (array) mysqli_fetch_field_direct($this->resultSet, $i);
 		}
 		return $meta;
 	}
@@ -388,13 +388,13 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Returns the resultset resource.
+	 * Returns the result set resource.
 	 *
 	 * @return mysqli_result
 	 */
 	public function getResultResource()
 	{
-		return $this->resultset;
+		return $this->resultSet;
 	}
 
 
diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php
index aa294441..69cd73f0 100644
--- a/dibi/drivers/odbc.php
+++ b/dibi/drivers/odbc.php
@@ -47,7 +47,7 @@ class DibiOdbcDriver extends /*Nette::*/Object implements IDibiDriver
 	 * Resultset resource.
 	 * @var resource
 	 */
-	private $resultset;
+	private $resultSet;
 
 
 	/**
@@ -120,13 +120,13 @@ class DibiOdbcDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function query($sql)
 	{
-		$this->resultset = @odbc_exec($this->connection, $sql); // intentionally @
+		$this->resultSet = @odbc_exec($this->connection, $sql); // intentionally @
 
-		if ($this->resultset === FALSE) {
+		if ($this->resultSet === FALSE) {
 			$this->throwException($sql);
 		}
 
-		return is_resource($this->resultset) ? clone $this : NULL;
+		return is_resource($this->resultSet) ? clone $this : NULL;
 	}
 
 
@@ -138,7 +138,7 @@ class DibiOdbcDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function affectedRows()
 	{
-		return odbc_num_rows($this->resultset);
+		return odbc_num_rows($this->resultSet);
 	}
 
 
@@ -234,7 +234,7 @@ class DibiOdbcDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Decodes data from resultset.
+	 * Decodes data from result set.
 	 *
 	 * @param  string    value
 	 * @param  string    type (dibi::FIELD_BINARY)
@@ -276,7 +276,7 @@ class DibiOdbcDriver extends /*Nette::*/Object implements IDibiDriver
 	public function rowCount()
 	{
 		// will return -1 with many drivers :-(
-		return odbc_num_rows($this->resultset);
+		return odbc_num_rows($this->resultSet);
 	}
 
 
@@ -291,9 +291,9 @@ class DibiOdbcDriver extends /*Nette::*/Object implements IDibiDriver
 	public function fetch($type)
 	{
 		if ($type) {
-			return odbc_fetch_array($this->resultset, ++$this->row);
+			return odbc_fetch_array($this->resultSet, ++$this->row);
 		} else {
-			$set = $this->resultset;
+			$set = $this->resultSet;
 			if (!odbc_fetch_row($set, ++$this->row)) return FALSE;
 			$count = odbc_num_fields($set);
 			$cols = array();
@@ -326,8 +326,8 @@ class DibiOdbcDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function free()
 	{
-		odbc_free_result($this->resultset);
-		$this->resultset = NULL;
+		odbc_free_result($this->resultSet);
+		$this->resultSet = NULL;
 	}
 
 
@@ -339,17 +339,17 @@ class DibiOdbcDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function getColumnsMeta()
 	{
-		$count = odbc_num_fields($this->resultset);
+		$count = odbc_num_fields($this->resultSet);
 		$meta = array();
 		for ($i = 1; $i <= $count; $i++) {
 			// items 'name' and 'table' are required
 			$meta[] = array(
-				'name'      => odbc_field_name($this->resultset, $i),
+				'name'      => odbc_field_name($this->resultSet, $i),
 				'table'     => NULL,
-				'type'      => odbc_field_type($this->resultset, $i),
-				'length'    => odbc_field_len($this->resultset, $i),
-				'scale'     => odbc_field_scale($this->resultset, $i),
-				'precision' => odbc_field_precision($this->resultset, $i),
+				'type'      => odbc_field_type($this->resultSet, $i),
+				'length'    => odbc_field_len($this->resultSet, $i),
+				'scale'     => odbc_field_scale($this->resultSet, $i),
+				'precision' => odbc_field_precision($this->resultSet, $i),
 			);
 		}
 		return $meta;
@@ -382,13 +382,13 @@ class DibiOdbcDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Returns the resultset resource.
+	 * Returns the result set resource.
 	 *
 	 * @return mixed
 	 */
 	public function getResultResource()
 	{
-		return $this->resultset;
+		return $this->resultSet;
 	}
 
 
diff --git a/dibi/drivers/oracle.php b/dibi/drivers/oracle.php
index f23ce409..19957bac 100644
--- a/dibi/drivers/oracle.php
+++ b/dibi/drivers/oracle.php
@@ -47,7 +47,7 @@ class DibiOracleDriver extends /*Nette::*/Object implements IDibiDriver
 	 * Resultset resource.
 	 * @var resource
 	 */
-	private $resultset;
+	private $resultSet;
 
 
 	/**
@@ -114,10 +114,10 @@ class DibiOracleDriver extends /*Nette::*/Object implements IDibiDriver
 	public function query($sql)
 	{
 
-		$this->resultset = oci_parse($this->connection, $sql);
-		if ($this->resultset) {
-			oci_execute($this->resultset, $this->autocommit ? OCI_COMMIT_ON_SUCCESS : OCI_DEFAULT);
-			$err = oci_error($this->resultset);
+		$this->resultSet = oci_parse($this->connection, $sql);
+		if ($this->resultSet) {
+			oci_execute($this->resultSet, $this->autocommit ? OCI_COMMIT_ON_SUCCESS : OCI_DEFAULT);
+			$err = oci_error($this->resultSet);
 			if ($err) {
 				throw new DibiDriverException($err['message'], $err['code'], $sql);
 			}
@@ -125,7 +125,7 @@ class DibiOracleDriver extends /*Nette::*/Object implements IDibiDriver
 			$this->throwException($sql);
 		}
 
-		return is_resource($this->resultset) ? clone $this : NULL;
+		return is_resource($this->resultSet) ? clone $this : NULL;
 	}
 
 
@@ -231,7 +231,7 @@ class DibiOracleDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Decodes data from resultset.
+	 * Decodes data from result set.
 	 *
 	 * @param  string    value
 	 * @param  string    type (dibi::FIELD_BINARY)
@@ -268,7 +268,7 @@ class DibiOracleDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function rowCount()
 	{
-		return oci_num_rows($this->resultset);
+		return oci_num_rows($this->resultSet);
 	}
 
 
@@ -282,7 +282,7 @@ class DibiOracleDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function fetch($type)
 	{
-		return oci_fetch_array($this->resultset, ($type ? OCI_ASSOC : OCI_NUM) | OCI_RETURN_NULLS);
+		return oci_fetch_array($this->resultSet, ($type ? OCI_ASSOC : OCI_NUM) | OCI_RETURN_NULLS);
 	}
 
 
@@ -308,8 +308,8 @@ class DibiOracleDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function free()
 	{
-		oci_free_statement($this->resultset);
-		$this->resultset = NULL;
+		oci_free_statement($this->resultSet);
+		$this->resultSet = NULL;
 	}
 
 
@@ -321,17 +321,17 @@ class DibiOracleDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function getColumnsMeta()
 	{
-		$count = oci_num_fields($this->resultset);
+		$count = oci_num_fields($this->resultSet);
 		$meta = array();
 		for ($i = 1; $i <= $count; $i++) {
 			// items 'name' and 'table' are required
 			$meta[] = array(
-				'name'      => oci_field_name($this->resultset, $i),
+				'name'      => oci_field_name($this->resultSet, $i),
 				'table'     => NULL,
-				'type'      => oci_field_type($this->resultset, $i),
-				'size'      => oci_field_size($this->resultset, $i),
-				'scale'     => oci_field_scale($this->resultset, $i),
-				'precision' => oci_field_precision($this->resultset, $i),
+				'type'      => oci_field_type($this->resultSet, $i),
+				'size'      => oci_field_size($this->resultSet, $i),
+				'scale'     => oci_field_scale($this->resultSet, $i),
+				'precision' => oci_field_precision($this->resultSet, $i),
 			);
 		}
 		return $meta;
@@ -365,13 +365,13 @@ class DibiOracleDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Returns the resultset resource.
+	 * Returns the result set resource.
 	 *
 	 * @return mixed
 	 */
 	public function getResultResource()
 	{
-		return $this->resultset;
+		return $this->resultSet;
 	}
 
 
diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index 4399744f..2b22edd3 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -48,7 +48,7 @@ class DibiPdoDriver extends /*Nette::*/Object implements IDibiDriver
 	 * Resultset resource.
 	 * @var PDOStatement
 	 */
-	private $resultset;
+	private $resultSet;
 
 
 	/**
@@ -123,12 +123,12 @@ class DibiPdoDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function query($sql)
 	{
-		// must detect if SQL returns resultset or num of affected rows
+		// must detect if SQL returns result set or num of affected rows
 		$cmd = strtoupper(substr(ltrim($sql), 0, 6));
 		$list = array('UPDATE'=>1, 'DELETE'=>1, 'INSERT'=>1, 'REPLAC'=>1);
 
 		if (isset($list[$cmd])) {
-			$this->resultset = NULL;
+			$this->resultSet = NULL;
 			$this->affectedRows = $this->connection->exec($sql);
 
 			if ($this->affectedRows === FALSE) {
@@ -138,10 +138,10 @@ class DibiPdoDriver extends /*Nette::*/Object implements IDibiDriver
 			return NULL;
 
 		} else {
-			$this->resultset = $this->connection->query($sql);
+			$this->resultSet = $this->connection->query($sql);
 			$this->affectedRows = FALSE;
 
-			if ($this->resultset === FALSE) {
+			if ($this->resultSet === FALSE) {
 				$this->throwException($sql);
 			}
 
@@ -275,7 +275,7 @@ class DibiPdoDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Decodes data from resultset.
+	 * Decodes data from result set.
 	 *
 	 * @param  string    value
 	 * @param  string    type (dibi::FIELD_BINARY)
@@ -325,7 +325,7 @@ class DibiPdoDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function fetch($type)
 	{
-		return $this->resultset->fetch($type ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
+		return $this->resultSet->fetch($type ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 	}
 
 
@@ -351,7 +351,7 @@ class DibiPdoDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function free()
 	{
-		$this->resultset = NULL;
+		$this->resultSet = NULL;
 	}
 
 
@@ -364,11 +364,11 @@ class DibiPdoDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function getColumnsMeta()
 	{
-		$count = $this->resultset->columnCount();
+		$count = $this->resultSet->columnCount();
 		$meta = array();
 		for ($i = 0; $i < $count; $i++) {
 			// items 'name' and 'table' are required
-			$info = @$this->resultset->getColumnsMeta($i); // intentionally @
+			$info = @$this->resultSet->getColumnsMeta($i); // intentionally @
 			if ($info === FALSE) {
 				throw new DibiDriverException('Driver does not support meta data.');
 			}
@@ -405,13 +405,13 @@ class DibiPdoDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Returns the resultset resource.
+	 * Returns the result set resource.
 	 *
 	 * @return PDOStatement
 	 */
 	public function getResultResource()
 	{
-		return $this->resultset;
+		return $this->resultSet;
 	}
 
 
diff --git a/dibi/drivers/postgre.php b/dibi/drivers/postgre.php
index 606ac43c..42212b37 100644
--- a/dibi/drivers/postgre.php
+++ b/dibi/drivers/postgre.php
@@ -48,7 +48,7 @@ class DibiPostgreDriver extends /*Nette::*/Object implements IDibiDriver
 	 * Resultset resource.
 	 * @var resource
 	 */
-	private $resultset;
+	private $resultSet;
 
 
 	/**
@@ -141,13 +141,13 @@ class DibiPostgreDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function query($sql)
 	{
-		$this->resultset = @pg_query($this->connection, $sql); // intentionally @
+		$this->resultSet = @pg_query($this->connection, $sql); // intentionally @
 
-		if ($this->resultset === FALSE) {
+		if ($this->resultSet === FALSE) {
 			throw new DibiDriverException(pg_last_error($this->connection), 0, $sql);
 		}
 
-		return is_resource($this->resultset) && pg_num_fields($this->resultset) ? clone $this : NULL;
+		return is_resource($this->resultSet) && pg_num_fields($this->resultSet) ? clone $this : NULL;
 	}
 
 
@@ -159,7 +159,7 @@ class DibiPostgreDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function affectedRows()
 	{
-		return pg_affected_rows($this->resultset);
+		return pg_affected_rows($this->resultSet);
 	}
 
 
@@ -274,7 +274,7 @@ class DibiPostgreDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Decodes data from resultset.
+	 * Decodes data from result set.
 	 *
 	 * @param  string    value
 	 * @param  string    type (dibi::FIELD_BINARY)
@@ -320,7 +320,7 @@ class DibiPostgreDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function rowCount()
 	{
-		return pg_num_rows($this->resultset);
+		return pg_num_rows($this->resultSet);
 	}
 
 
@@ -334,7 +334,7 @@ class DibiPostgreDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function fetch($type)
 	{
-		return pg_fetch_array($this->resultset, NULL, $type ? PGSQL_ASSOC : PGSQL_NUM);
+		return pg_fetch_array($this->resultSet, NULL, $type ? PGSQL_ASSOC : PGSQL_NUM);
 	}
 
 
@@ -348,7 +348,7 @@ class DibiPostgreDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function seek($row)
 	{
-		return pg_result_seek($this->resultset, $row);
+		return pg_result_seek($this->resultSet, $row);
 	}
 
 
@@ -360,8 +360,8 @@ class DibiPostgreDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function free()
 	{
-		pg_free_result($this->resultset);
-		$this->resultset = NULL;
+		pg_free_result($this->resultSet);
+		$this->resultSet = NULL;
 	}
 
 
@@ -374,16 +374,16 @@ class DibiPostgreDriver extends /*Nette::*/Object implements IDibiDriver
 	public function getColumnsMeta()
 	{
 		$hasTable = version_compare(PHP_VERSION , '5.2.0', '>=');
-		$count = pg_num_fields($this->resultset);
+		$count = pg_num_fields($this->resultSet);
 		$meta = array();
 		for ($i = 0; $i < $count; $i++) {
 			// items 'name' and 'table' are required
 			$meta[] = array(
-				'name'      => pg_field_name($this->resultset, $i),
-				'table'     => $hasTable ? pg_field_table($this->resultset, $i) : NULL,
-				'type'      => pg_field_type($this->resultset, $i),
-				'size'      => pg_field_size($this->resultset, $i),
-				'prtlen'    => pg_field_prtlen($this->resultset, $i),
+				'name'      => pg_field_name($this->resultSet, $i),
+				'table'     => $hasTable ? pg_field_table($this->resultSet, $i) : NULL,
+				'type'      => pg_field_type($this->resultSet, $i),
+				'size'      => pg_field_size($this->resultSet, $i),
+				'prtlen'    => pg_field_prtlen($this->resultSet, $i),
 			);
 		}
 		return $meta;
@@ -404,13 +404,13 @@ class DibiPostgreDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Returns the resultset resource.
+	 * Returns the result set resource.
 	 *
 	 * @return mixed
 	 */
 	public function getResultResource()
 	{
-		return $this->resultset;
+		return $this->resultSet;
 	}
 
 
diff --git a/dibi/drivers/sqlite.php b/dibi/drivers/sqlite.php
index 5f5aa9ce..f05e3bd9 100644
--- a/dibi/drivers/sqlite.php
+++ b/dibi/drivers/sqlite.php
@@ -48,7 +48,7 @@ class DibiSqliteDriver extends /*Nette::*/Object implements IDibiDriver
 	 * Resultset resource.
 	 * @var resource
 	 */
-	private $resultset;
+	private $resultSet;
 
 
 	/**
@@ -129,15 +129,15 @@ class DibiSqliteDriver extends /*Nette::*/Object implements IDibiDriver
 	{
 		DibiDriverException::tryError();
 		if ($this->buffered) {
-			$this->resultset = sqlite_query($this->connection, $sql);
+			$this->resultSet = sqlite_query($this->connection, $sql);
 		} else {
-			$this->resultset = sqlite_unbuffered_query($this->connection, $sql);
+			$this->resultSet = sqlite_unbuffered_query($this->connection, $sql);
 		}
 		if (DibiDriverException::catchError($msg)) {
 			throw new DibiDriverException($msg, sqlite_last_error($this->connection), $sql);
 		}
 
-		return is_resource($this->resultset) ? clone $this : NULL;
+		return is_resource($this->resultSet) ? clone $this : NULL;
 	}
 
 
@@ -237,7 +237,7 @@ class DibiSqliteDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Decodes data from resultset.
+	 * Decodes data from result set.
 	 *
 	 * @param  string    value
 	 * @param  string    type (dibi::FIELD_BINARY)
@@ -277,7 +277,7 @@ class DibiSqliteDriver extends /*Nette::*/Object implements IDibiDriver
 		if (!$this->buffered) {
 			throw new DibiDriverException('Row count is not available for unbuffered queries.');
 		}
-		return sqlite_num_rows($this->resultset);
+		return sqlite_num_rows($this->resultSet);
 	}
 
 
@@ -291,7 +291,7 @@ class DibiSqliteDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function fetch($type)
 	{
-		return sqlite_fetch_array($this->resultset, $type ? SQLITE_ASSOC : SQLITE_NUM);
+		return sqlite_fetch_array($this->resultSet, $type ? SQLITE_ASSOC : SQLITE_NUM);
 	}
 
 
@@ -308,7 +308,7 @@ class DibiSqliteDriver extends /*Nette::*/Object implements IDibiDriver
 		if (!$this->buffered) {
 			throw new DibiDriverException('Cannot seek an unbuffered result set.');
 		}
-		return sqlite_seek($this->resultset, $row);
+		return sqlite_seek($this->resultSet, $row);
 	}
 
 
@@ -320,7 +320,7 @@ class DibiSqliteDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function free()
 	{
-		$this->resultset = NULL;
+		$this->resultSet = NULL;
 	}
 
 
@@ -332,12 +332,12 @@ class DibiSqliteDriver extends /*Nette::*/Object implements IDibiDriver
 	 */
 	public function getColumnsMeta()
 	{
-		$count = sqlite_num_fields($this->resultset);
+		$count = sqlite_num_fields($this->resultSet);
 		$meta = array();
 		for ($i = 0; $i < $count; $i++) {
 			// items 'name' and 'table' are required
 			$meta[] = array(
-				'name'  => sqlite_field_name($this->resultset, $i),
+				'name'  => sqlite_field_name($this->resultSet, $i),
 				'table' => NULL,
 			);
 		}
@@ -359,13 +359,13 @@ class DibiSqliteDriver extends /*Nette::*/Object implements IDibiDriver
 
 
 	/**
-	 * Returns the resultset resource.
+	 * Returns the result set resource.
 	 *
 	 * @return mixed
 	 */
 	public function getResultResource()
 	{
-		return $this->resultset;
+		return $this->resultSet;
 	}
 
 
diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php
index 1321ab66..1368f5c0 100644
--- a/dibi/libs/DibiConnection.php
+++ b/dibi/libs/DibiConnection.php
@@ -389,7 +389,7 @@ class DibiConnection extends /*Nette::*/Object
 
 
 	/**
-	 * Decodes data from resultset.
+	 * Decodes data from result set.
 	 *
 	 * @param  string    value
 	 * @param  string    type (dibi::FIELD_BINARY)
diff --git a/dibi/libs/DibiResult.php b/dibi/libs/DibiResult.php
index 3605274a..1696712f 100644
--- a/dibi/libs/DibiResult.php
+++ b/dibi/libs/DibiResult.php
@@ -113,7 +113,7 @@ class DibiResult extends /*Nette::*/Object implements IDataSource
 
 
 	/**
-	 * Returns the resultset resource.
+	 * Returns the result set resource.
 	 *
 	 * @return mixed
 	 */
@@ -320,7 +320,7 @@ class DibiResult extends /*Nette::*/Object implements IDataSource
 		$limit = $limit === NULL ? -1 : (int) $limit;
 		$this->seek((int) $offset);
 		$row = $this->fetch();
-		if (!$row) return array();  // empty resultset
+		if (!$row) return array();  // empty result set
 
 		$data = array();
 		if ($simplify && !$this->objects && count($row) === 1) {
@@ -358,7 +358,7 @@ class DibiResult extends /*Nette::*/Object implements IDataSource
 	{
 		$this->seek(0);
 		$row = $this->fetch(FALSE);
-		if (!$row) return array();  // empty resultset
+		if (!$row) return array();  // empty result set
 
 		$data = NULL;
 		$assoc = explode(',', $assoc);
@@ -441,7 +441,7 @@ class DibiResult extends /*Nette::*/Object implements IDataSource
 	{
 		$this->seek(0);
 		$row = $this->fetch(FALSE);
-		if (!$row) return array();  // empty resultset
+		if (!$row) return array();  // empty result set
 
 		$data = array();
 
@@ -610,7 +610,7 @@ class DibiResult extends /*Nette::*/Object implements IDataSource
 		}
 
 		if ($none) {
-			echo '<p><em>empty resultset</em></p>';
+			echo '<p><em>empty result set</em></p>';
 		} else {
 			echo "</tbody>\n</table>\n";
 		}
diff --git a/dibi/libs/interfaces.php b/dibi/libs/interfaces.php
index fea0cefa..dd4dc940 100644
--- a/dibi/libs/interfaces.php
+++ b/dibi/libs/interfaces.php
@@ -154,7 +154,7 @@ interface IDibiDriver
 
 
 	/**
-	 * Decodes data from resultset.
+	 * Decodes data from result set.
 	 *
 	 * @param  string    value
 	 * @param  string    type (dibi::FIELD_BINARY)
@@ -211,7 +211,7 @@ interface IDibiDriver
 	/**
 	 * Frees the resources allocated for this result set.
 	 *
-	 * @param  resource  resultset resource
+	 * @param  resource  result set resource
 	 * @return void
 	 */
 	function free();
@@ -238,7 +238,7 @@ interface IDibiDriver
 
 
 	/**
-	 * Returns the resultset resource.
+	 * Returns the result set resource.
 	 *
 	 * @return mixed
 	 */