diff --git a/index.php b/index.php
index edc1fe6..2d2b474 100644
--- a/index.php
+++ b/index.php
@@ -107,9 +107,9 @@ foreach(pdo_drivers() as $d)
 }
 
 // Load Firebird if there is support
-if(function_exists('ibase_connect'))
+if(function_exists('fbird_connect'))
 {
-	require_once("{$path}firebird-ibase.php");
+	require_once("{$path}firebird.php");
 	require_once("{$path}firebird_sql.php");
 }
 
diff --git a/sys/db/drivers/firebird-ibase.php b/sys/db/drivers/firebird.php
similarity index 99%
rename from sys/db/drivers/firebird-ibase.php
rename to sys/db/drivers/firebird.php
index 5f6b30e..1c98d51 100644
--- a/sys/db/drivers/firebird-ibase.php
+++ b/sys/db/drivers/firebird.php
@@ -480,7 +480,9 @@ class Firebird_Result {
 		
 		// Let php do all the hard stuff in converting 
 		// the array of arguments into a list of arguments
-		return new Firebird_Result(call_user_func_array('fbird_execute', $args));
+		$this->__construct(call_user_func_array('fbird_execute', $args));
+
+		return $this;
 	}
 	
 	// --------------------------------------------------------------------------
diff --git a/sys/windows/widgets/db_info_widget.php b/sys/windows/widgets/db_info_widget.php
index 1ca31ba..72f1831 100644
--- a/sys/windows/widgets/db_info_widget.php
+++ b/sys/windows/widgets/db_info_widget.php
@@ -328,7 +328,7 @@ class DB_Info_Widget extends GtkTable {
 		}
 
 		// Add firebird support, if exists
-		if(function_exists('ibase_connect') && ! in_array('firebird', $pdo_drivers))
+		if(function_exists('fbird_connect') && ! in_array('firebird', $pdo_drivers))
 		{
 			$drivers[] = "Firebird";
 		}
diff --git a/tests/index.php b/tests/index.php
index 74a7546..ac4095a 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -62,9 +62,9 @@ foreach(pdo_drivers() as $d)
 }
 
 // Load Firebird if there is support
-if(function_exists('ibase_connect'))
+if(function_exists('fbird_connect'))
 {
-	require_once("{$src_path}firebird-ibase.php");
+	require_once("{$src_path}firebird.php");
 	require_once("{$src_path}firebird_sql.php");
 	require_once("{$test_path}firebird.php");
 	require_once("{$test_path}firebird-qb.php");