10 files changed, 28 insertions, 28 deletions
diff --git a/lua/tests/015-globals.lua b/lua/tests/015-globals.lua
index ee69f40c..9733ef5c 100755
--- a/lua/tests/015-globals.lua
+++ b/lua/tests/015-globals.lua
@@ -16,11 +16,11 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "guestfs"
+local G = require "guestfs"
 
-assert (Guestfs._COPYRIGHT)
-print ("_COPYRIGHT = ", Guestfs._COPYRIGHT)
-assert (Guestfs._DESCRIPTION)
-print ("_DESCRIPTION = ", Guestfs._DESCRIPTION)
-assert (Guestfs._VERSION)
-print ("_VERSION = ", Guestfs._VERSION)
+assert (G._COPYRIGHT)
+print ("_COPYRIGHT = ", G._COPYRIGHT)
+assert (G._DESCRIPTION)
+print ("_DESCRIPTION = ", G._DESCRIPTION)
+assert (G._VERSION)
+print ("_VERSION = ", G._VERSION)
diff --git a/lua/tests/020-create.lua b/lua/tests/020-create.lua
index 527aa0bc..b7e748d6 100755
--- a/lua/tests/020-create.lua
+++ b/lua/tests/020-create.lua
@@ -16,6 +16,6 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "guestfs"
+local G = require "guestfs"
 
-local g = Guestfs.create ()
+local g = G.create ()
diff --git a/lua/tests/025-create-flags.lua b/lua/tests/025-create-flags.lua
index 881b1834..08865c70 100755
--- a/lua/tests/025-create-flags.lua
+++ b/lua/tests/025-create-flags.lua
@@ -16,6 +16,6 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "guestfs"
+local G = require "guestfs"
 
-local g = Guestfs.create { environment = 0 }
+local g = G.create { environment = 0 }
diff --git a/lua/tests/027-create-multiple.lua b/lua/tests/027-create-multiple.lua
index bd6cae56..a3f8c8cf 100755
--- a/lua/tests/027-create-multiple.lua
+++ b/lua/tests/027-create-multiple.lua
@@ -16,11 +16,11 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "guestfs"
+local G = require "guestfs"
 
-g1 = Guestfs.create ()
-g2 = Guestfs.create ()
-g3 = Guestfs.create ()
+local g1 = G.create ()
+local g2 = G.create ()
+local g3 = G.create ()
 
 -- Check that each handle is independent.
 g1:set_path ("1")
diff --git a/lua/tests/030-config.lua b/lua/tests/030-config.lua
index 53e47fc8..d70528c0 100755
--- a/lua/tests/030-config.lua
+++ b/lua/tests/030-config.lua
@@ -16,9 +16,9 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "guestfs"
+local G = require "guestfs"
 
-local g = Guestfs.create ()
+local g = G.create ()
 
 local verbose = g:get_verbose ()
 g:set_verbose (true)
diff --git a/lua/tests/050-lvcreate.lua b/lua/tests/050-lvcreate.lua
index 3bd95c23..9fd5bec7 100755
--- a/lua/tests/050-lvcreate.lua
+++ b/lua/tests/050-lvcreate.lua
@@ -16,9 +16,9 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "guestfs"
+local G = require "guestfs"
 
-local g = Guestfs.create ()
+local g = G.create ()
 
 file = io.open ("test.img", "w")
 file:seek ("set", 500 * 1024 * 1024)
diff --git a/lua/tests/060-readdir.lua b/lua/tests/060-readdir.lua
index 07e8e3ba..b1481370 100755
--- a/lua/tests/060-readdir.lua
+++ b/lua/tests/060-readdir.lua
@@ -16,9 +16,9 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "guestfs"
+local G = require "guestfs"
 
-local g = Guestfs.create ()
+local g = G.create ()
 
 file = io.open ("test.img", "w")
 file:seek ("set", 10 * 1024 * 1024)
diff --git a/lua/tests/070-optargs.lua b/lua/tests/070-optargs.lua
index fe0ec753..00559a1b 100755
--- a/lua/tests/070-optargs.lua
+++ b/lua/tests/070-optargs.lua
@@ -16,9 +16,9 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "guestfs"
+local G = require "guestfs"
 
-local g = Guestfs.create ()
+local g = G.create ()
 
 g:add_drive ("/dev/null")
 g:add_drive ("/dev/null", { readonly = true })
diff --git a/lua/tests/400-events.lua b/lua/tests/400-events.lua
index 47a86a5e..c17bdc27 100755
--- a/lua/tests/400-events.lua
+++ b/lua/tests/400-events.lua
@@ -16,13 +16,13 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "guestfs"
+local G = require "guestfs"
 
-for i, v in ipairs (Guestfs.event_all) do
+for i, v in ipairs (G.event_all) do
    print (i, v)
 end
 
-g = Guestfs.create ()
+local g = G.create ()
 
 function log_callback (g, event, eh, flags, buf, array)
    io.write (string.format ("lua event logged: event=%s eh=%d buf='%s'\n",
diff --git a/lua/tests/400-progress.lua b/lua/tests/400-progress.lua
index e0e17ac8..293a4631 100755
--- a/lua/tests/400-progress.lua
+++ b/lua/tests/400-progress.lua
@@ -16,9 +16,9 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "guestfs"
+local G = require "guestfs"
 
-g = Guestfs.create ()
+local g = G.create ()
 
 g:add_drive ("/dev/null")
 g:launch ()