From 14525e816142ccbad630264292f4e28452b2e011 Mon Sep 17 00:00:00 2001
From: Jason Perkins <starkos@industriousone.com>
Date: Fri, 28 Aug 2015 16:16:14 -0400
Subject: [PATCH] Changes names in core test suites

---
 tests/actions/make/cpp/test_clang.lua         |  6 ++---
 tests/actions/make/cpp/test_file_rules.lua    |  6 ++---
 tests/actions/make/cpp/test_flags.lua         |  4 ++--
 tests/actions/make/cpp/test_make_linking.lua  | 10 ++++-----
 tests/actions/make/cpp/test_make_pch.lua      |  4 ++--
 tests/actions/make/cpp/test_objects.lua       |  6 ++---
 tests/actions/make/cpp/test_target_rules.lua  |  4 ++--
 tests/actions/make/cpp/test_tools.lua         |  2 +-
 tests/actions/make/cpp/test_wiidev.lua        |  2 +-
 tests/actions/make/cs/test_embed_files.lua    |  6 ++---
 tests/actions/make/cs/test_flags.lua          |  4 ++--
 tests/actions/make/cs/test_links.lua          |  8 +++----
 tests/actions/make/cs/test_response.lua       |  6 ++---
 tests/actions/make/cs/test_sources.lua        |  6 ++---
 .../make/solution/test_config_maps.lua        |  6 ++---
 .../make/solution/test_default_config.lua     |  6 ++---
 .../actions/make/solution/test_group_rule.lua | 18 +++++++--------
 .../actions/make/solution/test_help_rule.lua  |  8 +++----
 .../make/solution/test_project_rule.lua       |  8 +++----
 .../actions/vstudio/cs2005/projectelement.lua |  4 ++--
 .../vstudio/cs2005/projectsettings.lua        |  6 ++---
 .../vstudio/cs2005/test_assembly_refs.lua     |  6 ++---
 .../vstudio/cs2005/test_build_events.lua      |  6 ++---
 .../vstudio/cs2005/test_common_props.lua      |  6 ++---
 .../vstudio/cs2005/test_compiler_props.lua    |  4 ++--
 .../vstudio/cs2005/test_debug_props.lua       |  4 ++--
 tests/actions/vstudio/cs2005/test_files.lua   |  6 ++---
 tests/actions/vstudio/cs2005/test_icon.lua    |  6 ++---
 .../vstudio/cs2005/test_output_props.lua      |  4 ++--
 .../vstudio/cs2005/test_project_refs.lua      |  8 +++----
 tests/actions/vstudio/cs2005/test_targets.lua |  6 ++---
 .../actions/vstudio/cs2005/test_user_file.lua |  6 ++---
 .../vstudio/sln2005/test_dependencies.lua     | 12 +++++-----
 tests/actions/vstudio/sln2005/test_header.lua |  4 ++--
 .../vstudio/sln2005/test_nested_projects.lua  |  6 ++---
 .../vstudio/sln2005/test_platforms.lua        |  8 +++----
 .../actions/vstudio/sln2005/test_projects.lua |  8 +++----
 .../vstudio/vc200x/test_assembly_refs.lua     |  6 ++---
 .../vstudio/vc200x/test_build_steps.lua       |  4 ++--
 .../vstudio/vc200x/test_compiler_block.lua    |  4 ++--
 .../vstudio/vc200x/test_configuration.lua     |  6 ++---
 .../vstudio/vc200x/test_debug_settings.lua    |  4 ++--
 .../vstudio/vc200x/test_excluded_configs.lua  |  4 ++--
 tests/actions/vstudio/vc200x/test_files.lua   |  6 ++---
 .../vstudio/vc200x/test_linker_block.lua      |  4 ++--
 .../vstudio/vc200x/test_manifest_block.lua    |  4 ++--
 .../vstudio/vc200x/test_nmake_settings.lua    |  4 ++--
 .../actions/vstudio/vc200x/test_platforms.lua |  6 ++---
 tests/actions/vstudio/vc200x/test_project.lua |  6 ++---
 .../vstudio/vc200x/test_project_refs.lua      |  8 +++----
 .../vstudio/vc200x/test_resource_compiler.lua |  4 ++--
 .../actions/vstudio/vc200x/test_user_file.lua |  6 ++---
 .../vstudio/vc2010/test_assembly_refs.lua     |  6 ++---
 .../vstudio/vc2010/test_build_events.lua      |  6 ++---
 .../actions/vstudio/vc2010/test_build_log.lua |  4 ++--
 .../vstudio/vc2010/test_compile_settings.lua  |  4 ++--
 .../vstudio/vc2010/test_config_props.lua      |  4 ++--
 .../vstudio/vc2010/test_debug_settings.lua    |  4 ++--
 .../vstudio/vc2010/test_excluded_configs.lua  |  4 ++--
 .../vc2010/test_extension_settings.lua        |  6 ++---
 .../vstudio/vc2010/test_extension_targets.lua |  6 ++---
 tests/actions/vstudio/vc2010/test_files.lua   |  6 ++---
 .../vstudio/vc2010/test_filter_ids.lua        |  6 ++---
 tests/actions/vstudio/vc2010/test_filters.lua |  6 ++---
 .../vstudio/vc2010/test_floatingpoint.lua     |  4 ++--
 tests/actions/vstudio/vc2010/test_globals.lua |  6 ++---
 .../vstudio/vc2010/test_imagexex_settings.lua |  4 ++--
 .../vstudio/vc2010/test_item_def_group.lua    |  4 ++--
 tests/actions/vstudio/vc2010/test_link.lua    |  8 +++----
 .../actions/vstudio/vc2010/test_manifest.lua  |  4 ++--
 .../vstudio/vc2010/test_nmake_props.lua       |  4 ++--
 .../vstudio/vc2010/test_output_props.lua      |  4 ++--
 .../vstudio/vc2010/test_platform_toolset.lua  |  4 ++--
 .../vstudio/vc2010/test_project_configs.lua   |  6 ++---
 .../vstudio/vc2010/test_project_refs.lua      |  8 +++----
 .../vstudio/vc2010/test_prop_sheet.lua        |  4 ++--
 .../vstudio/vc2010/test_resource_compile.lua  |  4 ++--
 .../actions/vstudio/vc2010/test_rule_vars.lua |  4 ++--
 .../actions/vstudio/vc2010/test_user_file.lua |  6 ++---
 .../vstudio/vc2010/test_vectorextensions.lua  |  4 ++--
 tests/api/test_boolean_kind.lua               |  2 +-
 tests/api/test_directory_kind.lua             |  2 +-
 tests/api/test_list_kind.lua                  |  2 +-
 tests/api/test_path_kind.lua                  |  6 ++---
 tests/api/test_string_kind.lua                | 12 +++++-----
 tests/api/test_table_kind.lua                 |  2 +-
 tests/base/test_detoken.lua                   |  4 ++--
 tests/base/test_filename.lua                  |  8 +++----
 tests/config/test_linkinfo.lua                |  4 ++--
 tests/config/test_links.lua                   |  4 ++--
 tests/config/test_targetinfo.lua              |  4 ++--
 tests/oven/test_filtering.lua                 |  8 +++----
 tests/oven/test_objdirs.lua                   | 16 +++++++-------
 tests/project/test_config_maps.lua            |  6 ++---
 tests/project/test_eachconfig.lua             |  6 ++---
 tests/project/test_getconfig.lua              |  6 ++---
 tests/project/test_location.lua               |  6 ++---
 tests/project/test_sources.lua                |  4 ++--
 tests/project/test_vpaths.lua                 |  4 ++--
 tests/solution/test_eachconfig.lua            |  6 ++---
 tests/solution/test_location.lua              | 10 ++++-----
 tests/solution/test_objdirs.lua               |  6 ++---
 tests/test_premake.lua                        | 17 +++++++-------
 tests/test_stress.lua                         |  2 +-
 tests/testfx.lua                              | 22 ++++++++++---------
 tests/tools/test_dotnet.lua                   |  4 ++--
 tests/tools/test_gcc.lua                      |  8 +++----
 tests/tools/test_msc.lua                      |  4 ++--
 tests/tools/test_snc.lua                      |  6 ++---
 109 files changed, 320 insertions(+), 317 deletions(-)

diff --git a/tests/actions/make/cpp/test_clang.lua b/tests/actions/make/cpp/test_clang.lua
index 11e3d3ce..27e851e9 100644
--- a/tests/actions/make/cpp/test_clang.lua
+++ b/tests/actions/make/cpp/test_clang.lua
@@ -14,12 +14,12 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		toolset "clang"
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.workspace.getproject(wks, 1)
 	end
 
 
diff --git a/tests/actions/make/cpp/test_file_rules.lua b/tests/actions/make/cpp/test_file_rules.lua
index afb716ad..8f44e342 100644
--- a/tests/actions/make/cpp/test_file_rules.lua
+++ b/tests/actions/make/cpp/test_file_rules.lua
@@ -13,15 +13,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		premake.escaper(make.esc)
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.workspace.getproject(wks, 1)
 		make.cppFileRules(prj)
 	end
 
diff --git a/tests/actions/make/cpp/test_flags.lua b/tests/actions/make/cpp/test_flags.lua
index 7f7b3502..f8aa11a3 100644
--- a/tests/actions/make/cpp/test_flags.lua
+++ b/tests/actions/make/cpp/test_flags.lua
@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(calls)
diff --git a/tests/actions/make/cpp/test_make_linking.lua b/tests/actions/make/cpp/test_make_linking.lua
index 1efe8b3e..c1495d9f 100644
--- a/tests/actions/make/cpp/test_make_linking.lua
+++ b/tests/actions/make/cpp/test_make_linking.lua
@@ -13,11 +13,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_OS = "linux"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(calls)
@@ -92,7 +92,7 @@
 	function suite.links_onSiblingStaticLib()
 		links "MyProject2"
 
-		test.createproject(sln)
+		test.createproject(wks)
 		kind "StaticLib"
 		location "build"
 
@@ -112,7 +112,7 @@
 	function suite.links_onSiblingSharedLib()
 		links "MyProject2"
 
-		test.createproject(sln)
+		test.createproject(wks)
 		kind "SharedLib"
 		location "build"
 
@@ -132,7 +132,7 @@
         links "MyProject2"
         flags { "RelativeLinks" }
 
-        test.createproject(sln)
+        test.createproject(wks)
         kind "SharedLib"
         location "build"
 
diff --git a/tests/actions/make/cpp/test_make_pch.lua b/tests/actions/make/cpp/test_make_pch.lua
index 3d14cdc5..5f929f06 100644
--- a/tests/actions/make/cpp/test_make_pch.lua
+++ b/tests/actions/make/cpp/test_make_pch.lua
@@ -14,9 +14,9 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepareVars()
diff --git a/tests/actions/make/cpp/test_objects.lua b/tests/actions/make/cpp/test_objects.lua
index 179083e3..de048ed9 100644
--- a/tests/actions/make/cpp/test_objects.lua
+++ b/tests/actions/make/cpp/test_objects.lua
@@ -13,14 +13,14 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		make.cppObjects(prj)
 	end
 
diff --git a/tests/actions/make/cpp/test_target_rules.lua b/tests/actions/make/cpp/test_target_rules.lua
index 24544a73..470ccc13 100644
--- a/tests/actions/make/cpp/test_target_rules.lua
+++ b/tests/actions/make/cpp/test_target_rules.lua
@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/make/cpp/test_tools.lua b/tests/actions/make/cpp/test_tools.lua
index 105033ff..8b234acc 100644
--- a/tests/actions/make/cpp/test_tools.lua
+++ b/tests/actions/make/cpp/test_tools.lua
@@ -17,7 +17,7 @@
 	local cfg
 
 	function suite.setup()
-		local sln, prj = test.createsolution()
+		local wks, prj = test.createWorkspace()
 		cfg = test.getconfig(prj, "Debug")
 	end
 
diff --git a/tests/actions/make/cpp/test_wiidev.lua b/tests/actions/make/cpp/test_wiidev.lua
index 27e3b036..5b92c11a 100644
--- a/tests/actions/make/cpp/test_wiidev.lua
+++ b/tests/actions/make/cpp/test_wiidev.lua
@@ -16,7 +16,7 @@
 	local cfg
 
 	function suite.setup()
-		local sln, prj = test.createsolution()
+		local wks, prj = test.createWorkspace()
 		system "wii"
 		flags "Symbols"
 		cfg = test.getconfig(prj, "Debug")
diff --git a/tests/actions/make/cs/test_embed_files.lua b/tests/actions/make/cs/test_embed_files.lua
index 39f3e1c6..1a0d759d 100644
--- a/tests/actions/make/cs/test_embed_files.lua
+++ b/tests/actions/make/cs/test_embed_files.lua
@@ -14,14 +14,14 @@
 -- Setup
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.workspace.getproject(wks, 1)
 		make.csEmbedFiles(prj, premake.tools.dotnet)
 	end
 
diff --git a/tests/actions/make/cs/test_flags.lua b/tests/actions/make/cs/test_flags.lua
index 3c63247f..40d028b2 100644
--- a/tests/actions/make/cs/test_flags.lua
+++ b/tests/actions/make/cs/test_flags.lua
@@ -14,10 +14,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/make/cs/test_links.lua b/tests/actions/make/cs/test_links.lua
index 4cee25b4..82ef9ba0 100644
--- a/tests/actions/make/cs/test_links.lua
+++ b/tests/actions/make/cs/test_links.lua
@@ -13,10 +13,10 @@
 -- Setup
 --
 
-    local sln, prj
+    local wks, prj
 
     function suite.setup()
-        sln, prj = test.createsolution()
+        wks, prj = test.createWorkspace()
     end
 
     local function prepare()
@@ -44,11 +44,11 @@
     function suite.doesListLinkDependencyFiles()
         links { "MyProject2", "MyProject3" }
 
-        test.createproject(sln)
+        test.createproject(wks)
         kind "SharedLib"
         language "C#"
 
-        test.createproject(sln)
+        test.createproject(wks)
         kind "SharedLib"
         language "C#"
 
diff --git a/tests/actions/make/cs/test_response.lua b/tests/actions/make/cs/test_response.lua
index 6a707789..58cd2bec 100644
--- a/tests/actions/make/cs/test_response.lua
+++ b/tests/actions/make/cs/test_response.lua
@@ -13,14 +13,14 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = test.getproject(sln, 1)
+		prj = test.getproject(wks, 1)
 	end
 
 
diff --git a/tests/actions/make/cs/test_sources.lua b/tests/actions/make/cs/test_sources.lua
index 3b60523e..60ec08bd 100644
--- a/tests/actions/make/cs/test_sources.lua
+++ b/tests/actions/make/cs/test_sources.lua
@@ -14,14 +14,14 @@
 -- Setup
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.workspace.getproject(wks, 1)
 		make.csSources(prj, premake.tools.dotnet)
 	end
 
diff --git a/tests/actions/make/solution/test_config_maps.lua b/tests/actions/make/solution/test_config_maps.lua
index 0bae9e7e..e5aef273 100644
--- a/tests/actions/make/solution/test_config_maps.lua
+++ b/tests/actions/make/solution/test_config_maps.lua
@@ -13,14 +13,14 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		make.configmap(sln)
+		make.configmap(wks)
 	end
 
 
diff --git a/tests/actions/make/solution/test_default_config.lua b/tests/actions/make/solution/test_default_config.lua
index b18be853..86f9a890 100644
--- a/tests/actions/make/solution/test_default_config.lua
+++ b/tests/actions/make/solution/test_default_config.lua
@@ -13,14 +13,14 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.workspace.getproject(wks, 1)
 		make.defaultconfig(prj)
 	end
 
diff --git a/tests/actions/make/solution/test_group_rule.lua b/tests/actions/make/solution/test_group_rule.lua
index 17b24013..9ac08ff5 100644
--- a/tests/actions/make/solution/test_group_rule.lua
+++ b/tests/actions/make/solution/test_group_rule.lua
@@ -12,21 +12,21 @@
 -- Setup/teardown
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		group "MainGroup"
-			test.createproject(sln)
+			test.createproject(wks)
 		group "MainGroup/SubGroup1"
-			test.createproject(sln)
+			test.createproject(wks)
 		group "MainGroup/SubGroup2"
-			test.createproject(sln)
-			test.createproject(sln)
+			test.createproject(wks)
+			test.createproject(wks)
 	end
 
 	local function prepare()
-		sln = test.getsolution(sln)
+		wks = test.getWorkspace(wks)
 	end
 
 
@@ -36,7 +36,7 @@
 
 	function suite.groupRule_groupAsPhony()
 		prepare()
-		make.solutionPhonyRule(sln)
+		make.workspacePhonyRule(wks)
 		test.capture [[
 .PHONY: all clean help $(PROJECTS) MainGroup MainGroup/SubGroup1 MainGroup/SubGroup2
 		]]
@@ -47,7 +47,7 @@
 --
 	function suite.groupRule_groupRules()
 		prepare()
-		make.groupRules(sln)
+		make.groupRules(wks)
 		test.capture [[
 MainGroup: MainGroup/SubGroup1 MainGroup/SubGroup2 MyProject2
 
diff --git a/tests/actions/make/solution/test_help_rule.lua b/tests/actions/make/solution/test_help_rule.lua
index af8f100d..a4be6fc4 100644
--- a/tests/actions/make/solution/test_help_rule.lua
+++ b/tests/actions/make/solution/test_help_rule.lua
@@ -11,15 +11,15 @@
 -- Setup/teardown
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		sln = test.getsolution(sln)
-		premake.make.helprule(sln)
+		wks = test.getWorkspace(wks)
+		premake.make.helprule(wks)
 	end
 
 
diff --git a/tests/actions/make/solution/test_project_rule.lua b/tests/actions/make/solution/test_project_rule.lua
index 06e47f55..6ad94d06 100644
--- a/tests/actions/make/solution/test_project_rule.lua
+++ b/tests/actions/make/solution/test_project_rule.lua
@@ -11,16 +11,16 @@
 -- Setup/teardown
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
 		premake.oven.bake()
-		sln = test.getsolution(sln)
-		premake.make.projectrules(sln)
+		wks = test.getWorkspace(wks)
+		premake.make.projectrules(wks)
 	end
 
 
diff --git a/tests/actions/vstudio/cs2005/projectelement.lua b/tests/actions/vstudio/cs2005/projectelement.lua
index 66edafa5..676c7f8a 100755
--- a/tests/actions/vstudio/cs2005/projectelement.lua
+++ b/tests/actions/vstudio/cs2005/projectelement.lua
@@ -12,10 +12,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/cs2005/projectsettings.lua b/tests/actions/vstudio/cs2005/projectsettings.lua
index e8a987bc..57d3b5e4 100755
--- a/tests/actions/vstudio/cs2005/projectsettings.lua
+++ b/tests/actions/vstudio/cs2005/projectsettings.lua
@@ -13,17 +13,17 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2005"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		language "C#"
 		uuid "AE61726D-187C-E440-BD07-2556188A6565"
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.projectProperties(prj)
 	end
 
diff --git a/tests/actions/vstudio/cs2005/test_assembly_refs.lua b/tests/actions/vstudio/cs2005/test_assembly_refs.lua
index 8c3cb66e..0a2638dd 100644
--- a/tests/actions/vstudio/cs2005/test_assembly_refs.lua
+++ b/tests/actions/vstudio/cs2005/test_assembly_refs.lua
@@ -13,16 +13,16 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		language "C#"
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.assemblyReferences(prj)
 	end
 
diff --git a/tests/actions/vstudio/cs2005/test_build_events.lua b/tests/actions/vstudio/cs2005/test_build_events.lua
index 1943d513..b42fd93a 100644
--- a/tests/actions/vstudio/cs2005/test_build_events.lua
+++ b/tests/actions/vstudio/cs2005/test_build_events.lua
@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2010.esc)
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.buildEvents(prj)
 	end
 
diff --git a/tests/actions/vstudio/cs2005/test_common_props.lua b/tests/actions/vstudio/cs2005/test_common_props.lua
index c0058a33..35a8d145 100644
--- a/tests/actions/vstudio/cs2005/test_common_props.lua
+++ b/tests/actions/vstudio/cs2005/test_common_props.lua
@@ -12,16 +12,16 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2012"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		language "C#"
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.commonProperties(prj)
 	end
 
diff --git a/tests/actions/vstudio/cs2005/test_compiler_props.lua b/tests/actions/vstudio/cs2005/test_compiler_props.lua
index 43929e4d..de3c6623 100644
--- a/tests/actions/vstudio/cs2005/test_compiler_props.lua
+++ b/tests/actions/vstudio/cs2005/test_compiler_props.lua
@@ -13,11 +13,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2005"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/cs2005/test_debug_props.lua b/tests/actions/vstudio/cs2005/test_debug_props.lua
index bd24191c..6f6681bf 100644
--- a/tests/actions/vstudio/cs2005/test_debug_props.lua
+++ b/tests/actions/vstudio/cs2005/test_debug_props.lua
@@ -13,11 +13,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2005"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/cs2005/test_files.lua b/tests/actions/vstudio/cs2005/test_files.lua
index eb9b36ee..64c7494e 100755
--- a/tests/actions/vstudio/cs2005/test_files.lua
+++ b/tests/actions/vstudio/cs2005/test_files.lua
@@ -12,14 +12,14 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.files(prj)
 	end
 
diff --git a/tests/actions/vstudio/cs2005/test_icon.lua b/tests/actions/vstudio/cs2005/test_icon.lua
index bdb9b5bb..f1bfde06 100644
--- a/tests/actions/vstudio/cs2005/test_icon.lua
+++ b/tests/actions/vstudio/cs2005/test_icon.lua
@@ -12,14 +12,14 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.applicationIcon(prj)
 	end
 
diff --git a/tests/actions/vstudio/cs2005/test_output_props.lua b/tests/actions/vstudio/cs2005/test_output_props.lua
index 9d025781..b4d19d79 100644
--- a/tests/actions/vstudio/cs2005/test_output_props.lua
+++ b/tests/actions/vstudio/cs2005/test_output_props.lua
@@ -13,11 +13,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2005"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		language "C#"
 	end
 
diff --git a/tests/actions/vstudio/cs2005/test_project_refs.lua b/tests/actions/vstudio/cs2005/test_project_refs.lua
index dfe53e78..666956a9 100644
--- a/tests/actions/vstudio/cs2005/test_project_refs.lua
+++ b/tests/actions/vstudio/cs2005/test_project_refs.lua
@@ -13,17 +13,17 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		uuid "00112233-4455-6677-8888-99AABBCCDDEE"
-		test.createproject(sln)
+		test.createproject(wks)
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 2)
+		prj = premake.solution.getproject(wks, 2)
 		cs2005.projectReferences(prj)
 	end
 
diff --git a/tests/actions/vstudio/cs2005/test_targets.lua b/tests/actions/vstudio/cs2005/test_targets.lua
index b4d8080f..6c46ce15 100644
--- a/tests/actions/vstudio/cs2005/test_targets.lua
+++ b/tests/actions/vstudio/cs2005/test_targets.lua
@@ -12,16 +12,16 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2012"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		language "C#"
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.targets(prj)
 	end
 
diff --git a/tests/actions/vstudio/cs2005/test_user_file.lua b/tests/actions/vstudio/cs2005/test_user_file.lua
index 193555a9..3103b646 100644
--- a/tests/actions/vstudio/cs2005/test_user_file.lua
+++ b/tests/actions/vstudio/cs2005/test_user_file.lua
@@ -12,16 +12,16 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		language "C#"
 	end
 
 	local function prepare()
-		local prj = test.getproject(sln, 1)
+		local prj = test.getproject(wks, 1)
 		cs2005.generateUser(prj)
 	end
 
diff --git a/tests/actions/vstudio/sln2005/test_dependencies.lua b/tests/actions/vstudio/sln2005/test_dependencies.lua
index 544efccc..c34e88db 100755
--- a/tests/actions/vstudio/sln2005/test_dependencies.lua
+++ b/tests/actions/vstudio/sln2005/test_dependencies.lua
@@ -13,15 +13,15 @@
 -- Setup
 --
 
-	local sln, prj1, prj2
+	local wks, prj1, prj2
 
 	function suite.setup()
 		_ACTION = "vs2005"
-		sln, prj1 = test.createsolution()
+		wks, prj1 = test.createWorkspace()
 		uuid "AE61726D-187C-E440-BD07-2556188A6565"
-		prj2 = test.createproject(sln)
+		prj2 = test.createproject(wks)
 		uuid "2151E83B-997F-4A9D-955D-380157E88C31"
-		prj3 = test.createproject(sln)
+		prj3 = test.createproject(wks)
 		uuid "CAA68162-8B96-11E1-8D5E-5885BBE59B18"
 		links "MyProject"
 		dependson "MyProject2"
@@ -30,10 +30,10 @@
 	local function prepare(language)
 		prj1.language = language
 		prj2.language = language
-		prj2 = premake.solution.getproject(sln, 2)
+		prj2 = premake.solution.getproject(wks, 2)
 		sln2005.projectdependencies(prj2)
 		prj3.language = language
-		prj3 = premake.solution.getproject(sln, 3)
+		prj3 = premake.solution.getproject(wks, 3)
 		sln2005.projectdependencies(prj3)
 	end
 
diff --git a/tests/actions/vstudio/sln2005/test_header.lua b/tests/actions/vstudio/sln2005/test_header.lua
index 59897fd6..e5d1ceb2 100755
--- a/tests/actions/vstudio/sln2005/test_header.lua
+++ b/tests/actions/vstudio/sln2005/test_header.lua
@@ -12,10 +12,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/sln2005/test_nested_projects.lua b/tests/actions/vstudio/sln2005/test_nested_projects.lua
index bede43cf..edae75f1 100644
--- a/tests/actions/vstudio/sln2005/test_nested_projects.lua
+++ b/tests/actions/vstudio/sln2005/test_nested_projects.lua
@@ -13,18 +13,18 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		language "C++"
 		kind "ConsoleApp"
 	end
 
 	local function prepare()
-		sln2005.NestedProjects(sln)
+		sln2005.NestedProjects(wks)
 	end
 
 
diff --git a/tests/actions/vstudio/sln2005/test_platforms.lua b/tests/actions/vstudio/sln2005/test_platforms.lua
index ae013dfa..8d000e89 100644
--- a/tests/actions/vstudio/sln2005/test_platforms.lua
+++ b/tests/actions/vstudio/sln2005/test_platforms.lua
@@ -12,11 +12,11 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		configurations { "Debug", "Release" }
 		language "C++"
 	end
@@ -24,8 +24,8 @@
 	local function prepare(lang)
 		filter {}
 		uuid "C9135098-6047-8142-B10E-D27E7F73FCB3"
-		sln = test.getsolution(sln)
-		sln2005.configurationPlatforms(sln)
+		wks = test.getsolution(wks)
+		sln2005.configurationPlatforms(wks)
 	end
 
 
diff --git a/tests/actions/vstudio/sln2005/test_projects.lua b/tests/actions/vstudio/sln2005/test_projects.lua
index 9a42da14..b2d9cba2 100755
--- a/tests/actions/vstudio/sln2005/test_projects.lua
+++ b/tests/actions/vstudio/sln2005/test_projects.lua
@@ -12,19 +12,19 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		language "C++"
 		kind "ConsoleApp"
 	end
 
 	local function prepare()
-		sln2005.reorderProjects(sln)
-		sln2005.projects(sln)
+		sln2005.reorderProjects(wks)
+		sln2005.projects(wks)
 	end
 
 
diff --git a/tests/actions/vstudio/vc200x/test_assembly_refs.lua b/tests/actions/vstudio/vc200x/test_assembly_refs.lua
index b8157b1f..92e62867 100644
--- a/tests/actions/vstudio/vc200x/test_assembly_refs.lua
+++ b/tests/actions/vstudio/vc200x/test_assembly_refs.lua
@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		clr "On"
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc200x.assemblyReferences(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc200x/test_build_steps.lua b/tests/actions/vstudio/vc200x/test_build_steps.lua
index 646c9eaa..2285ad41 100644
--- a/tests/actions/vstudio/vc200x/test_build_steps.lua
+++ b/tests/actions/vstudio/vc200x/test_build_steps.lua
@@ -12,11 +12,11 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc200x/test_compiler_block.lua b/tests/actions/vstudio/vc200x/test_compiler_block.lua
index 7dab57b0..5e169ec6 100644
--- a/tests/actions/vstudio/vc200x/test_compiler_block.lua
+++ b/tests/actions/vstudio/vc200x/test_compiler_block.lua
@@ -12,11 +12,11 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc200x/test_configuration.lua b/tests/actions/vstudio/vc200x/test_configuration.lua
index a484a237..3fb17c5e 100755
--- a/tests/actions/vstudio/vc200x/test_configuration.lua
+++ b/tests/actions/vstudio/vc200x/test_configuration.lua
@@ -14,15 +14,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
-		local cfg = test.getconfig(prj, "Debug", (prj.platforms or sln.platforms or {})[1])
+		local cfg = test.getconfig(prj, "Debug", (prj.platforms or wks.platforms or {})[1])
 		vc200x.configuration(cfg, vstudio.projectConfig(cfg))
 	end
 
diff --git a/tests/actions/vstudio/vc200x/test_debug_settings.lua b/tests/actions/vstudio/vc200x/test_debug_settings.lua
index 6cc0bf1f..80533261 100644
--- a/tests/actions/vstudio/vc200x/test_debug_settings.lua
+++ b/tests/actions/vstudio/vc200x/test_debug_settings.lua
@@ -13,11 +13,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc200x/test_excluded_configs.lua b/tests/actions/vstudio/vc200x/test_excluded_configs.lua
index 8e9cd567..4b5c7a80 100644
--- a/tests/actions/vstudio/vc200x/test_excluded_configs.lua
+++ b/tests/actions/vstudio/vc200x/test_excluded_configs.lua
@@ -12,12 +12,12 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
 
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		configurations { "Debug", "Release" }
 		platforms { "Zeus", "Ares" }
 		language "C++"
diff --git a/tests/actions/vstudio/vc200x/test_files.lua b/tests/actions/vstudio/vc200x/test_files.lua
index 7c29f696..c0b9651b 100644
--- a/tests/actions/vstudio/vc200x/test_files.lua
+++ b/tests/actions/vstudio/vc200x/test_files.lua
@@ -12,16 +12,16 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = test.getproject(sln, 1)
+		prj = test.getproject(wks, 1)
 		vc200x.files(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc200x/test_linker_block.lua b/tests/actions/vstudio/vc200x/test_linker_block.lua
index bb8df3bf..da7e0afe 100644
--- a/tests/actions/vstudio/vc200x/test_linker_block.lua
+++ b/tests/actions/vstudio/vc200x/test_linker_block.lua
@@ -12,12 +12,12 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc200x/test_manifest_block.lua b/tests/actions/vstudio/vc200x/test_manifest_block.lua
index 63433091..f671d6b2 100755
--- a/tests/actions/vstudio/vc200x/test_manifest_block.lua
+++ b/tests/actions/vstudio/vc200x/test_manifest_block.lua
@@ -12,11 +12,11 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc200x/test_nmake_settings.lua b/tests/actions/vstudio/vc200x/test_nmake_settings.lua
index eada6105..98a61b90 100644
--- a/tests/actions/vstudio/vc200x/test_nmake_settings.lua
+++ b/tests/actions/vstudio/vc200x/test_nmake_settings.lua
@@ -12,11 +12,11 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "Makefile"
 	end
 
diff --git a/tests/actions/vstudio/vc200x/test_platforms.lua b/tests/actions/vstudio/vc200x/test_platforms.lua
index 375080b7..3cd1e503 100755
--- a/tests/actions/vstudio/vc200x/test_platforms.lua
+++ b/tests/actions/vstudio/vc200x/test_platforms.lua
@@ -13,15 +13,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc200x.platforms(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc200x/test_project.lua b/tests/actions/vstudio/vc200x/test_project.lua
index 767998e0..4df60785 100644
--- a/tests/actions/vstudio/vc200x/test_project.lua
+++ b/tests/actions/vstudio/vc200x/test_project.lua
@@ -12,16 +12,16 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = 'vs2008'
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		uuid "AE61726D-187C-E440-BD07-2556188A6565"
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc200x.visualStudioProject(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc200x/test_project_refs.lua b/tests/actions/vstudio/vc200x/test_project_refs.lua
index a5a39a24..d757ebbf 100644
--- a/tests/actions/vstudio/vc200x/test_project_refs.lua
+++ b/tests/actions/vstudio/vc200x/test_project_refs.lua
@@ -13,17 +13,17 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		uuid "00112233-4455-6677-8888-99AABBCCDDEE"
-		test.createproject(sln)
+		test.createproject(wks)
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 2)
+		prj = premake.solution.getproject(wks, 2)
 		vc200x.projectReferences(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc200x/test_resource_compiler.lua b/tests/actions/vstudio/vc200x/test_resource_compiler.lua
index 76172548..77b6f112 100644
--- a/tests/actions/vstudio/vc200x/test_resource_compiler.lua
+++ b/tests/actions/vstudio/vc200x/test_resource_compiler.lua
@@ -12,11 +12,11 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc200x/test_user_file.lua b/tests/actions/vstudio/vc200x/test_user_file.lua
index 9616d242..87814785 100644
--- a/tests/actions/vstudio/vc200x/test_user_file.lua
+++ b/tests/actions/vstudio/vc200x/test_user_file.lua
@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		local prj = test.getproject(sln, 1)
+		local prj = test.getproject(wks, 1)
 		vc200x.generateUser(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_assembly_refs.lua b/tests/actions/vstudio/vc2010/test_assembly_refs.lua
index 2ed36a13..cd54f606 100644
--- a/tests/actions/vstudio/vc2010/test_assembly_refs.lua
+++ b/tests/actions/vstudio/vc2010/test_assembly_refs.lua
@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		clr "On"
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc2010.assemblyReferences(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_build_events.lua b/tests/actions/vstudio/vc2010/test_build_events.lua
index fb829554..5290b7f8 100644
--- a/tests/actions/vstudio/vc2010/test_build_events.lua
+++ b/tests/actions/vstudio/vc2010/test_build_events.lua
@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2010.esc)
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc2010.buildEvents(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_build_log.lua b/tests/actions/vstudio/vc2010/test_build_log.lua
index 6d32c27a..3c8efa13 100644
--- a/tests/actions/vstudio/vc2010/test_build_log.lua
+++ b/tests/actions/vstudio/vc2010/test_build_log.lua
@@ -12,10 +12,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(platform)
diff --git a/tests/actions/vstudio/vc2010/test_compile_settings.lua b/tests/actions/vstudio/vc2010/test_compile_settings.lua
index adae8671..f04453c4 100644
--- a/tests/actions/vstudio/vc2010/test_compile_settings.lua
+++ b/tests/actions/vstudio/vc2010/test_compile_settings.lua
@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(platform)
diff --git a/tests/actions/vstudio/vc2010/test_config_props.lua b/tests/actions/vstudio/vc2010/test_config_props.lua
index 68430146..37404fa5 100755
--- a/tests/actions/vstudio/vc2010/test_config_props.lua
+++ b/tests/actions/vstudio/vc2010/test_config_props.lua
@@ -13,11 +13,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc2010/test_debug_settings.lua b/tests/actions/vstudio/vc2010/test_debug_settings.lua
index ad23b680..e5154d84 100755
--- a/tests/actions/vstudio/vc2010/test_debug_settings.lua
+++ b/tests/actions/vstudio/vc2010/test_debug_settings.lua
@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc2010/test_excluded_configs.lua b/tests/actions/vstudio/vc2010/test_excluded_configs.lua
index 32424639..14261a5f 100644
--- a/tests/actions/vstudio/vc2010/test_excluded_configs.lua
+++ b/tests/actions/vstudio/vc2010/test_excluded_configs.lua
@@ -12,12 +12,12 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
 
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		configurations { "Debug", "Release" }
 		platforms { "Zeus", "Ares" }
 		language "C++"
diff --git a/tests/actions/vstudio/vc2010/test_extension_settings.lua b/tests/actions/vstudio/vc2010/test_extension_settings.lua
index 5f4dbadc..856d0ed2 100644
--- a/tests/actions/vstudio/vc2010/test_extension_settings.lua
+++ b/tests/actions/vstudio/vc2010/test_extension_settings.lua
@@ -13,16 +13,16 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		rule "MyRules"
 		rule "MyOtherRules"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		local prj = test.getproject(sln)
+		local prj = test.getproject(wks)
 		vc2010.importExtensionSettings(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_extension_targets.lua b/tests/actions/vstudio/vc2010/test_extension_targets.lua
index 77ed8d19..b9277773 100644
--- a/tests/actions/vstudio/vc2010/test_extension_targets.lua
+++ b/tests/actions/vstudio/vc2010/test_extension_targets.lua
@@ -13,16 +13,16 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		rule "MyRules"
 		rule "MyOtherRules"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		local prj = test.getproject(sln)
+		local prj = test.getproject(wks)
 		vc2010.importExtensionTargets(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_files.lua b/tests/actions/vstudio/vc2010/test_files.lua
index 875eb91e..c8c05c06 100755
--- a/tests/actions/vstudio/vc2010/test_files.lua
+++ b/tests/actions/vstudio/vc2010/test_files.lua
@@ -12,7 +12,7 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
@@ -25,11 +25,11 @@
 			separator = ";"
 		}
 
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc2010.files(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_filter_ids.lua b/tests/actions/vstudio/vc2010/test_filter_ids.lua
index cb87a033..11c7cfbd 100644
--- a/tests/actions/vstudio/vc2010/test_filter_ids.lua
+++ b/tests/actions/vstudio/vc2010/test_filter_ids.lua
@@ -12,15 +12,15 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = test.getproject(sln)
+		prj = test.getproject(wks)
 		vc2010.uniqueIdentifiers(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_filters.lua b/tests/actions/vstudio/vc2010/test_filters.lua
index 668ee464..6a2d8ccd 100644
--- a/tests/actions/vstudio/vc2010/test_filters.lua
+++ b/tests/actions/vstudio/vc2010/test_filters.lua
@@ -12,15 +12,15 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare(group)
-		prj = test.getproject(sln)
+		prj = test.getproject(wks)
 		vc2010.filterGroups(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_floatingpoint.lua b/tests/actions/vstudio/vc2010/test_floatingpoint.lua
index ded8b997..fd8d2c64 100644
--- a/tests/actions/vstudio/vc2010/test_floatingpoint.lua
+++ b/tests/actions/vstudio/vc2010/test_floatingpoint.lua
@@ -10,11 +10,11 @@
 	local m = premake.vstudio.vc2010
 
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc2010/test_globals.lua b/tests/actions/vstudio/vc2010/test_globals.lua
index 6b5595b9..2189ff6e 100755
--- a/tests/actions/vstudio/vc2010/test_globals.lua
+++ b/tests/actions/vstudio/vc2010/test_globals.lua
@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc2010.globals(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_imagexex_settings.lua b/tests/actions/vstudio/vc2010/test_imagexex_settings.lua
index 666659d7..573d2ed9 100644
--- a/tests/actions/vstudio/vc2010/test_imagexex_settings.lua
+++ b/tests/actions/vstudio/vc2010/test_imagexex_settings.lua
@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		platforms "xbox360"
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_item_def_group.lua b/tests/actions/vstudio/vc2010/test_item_def_group.lua
index 72437603..76d00b58 100644
--- a/tests/actions/vstudio/vc2010/test_item_def_group.lua
+++ b/tests/actions/vstudio/vc2010/test_item_def_group.lua
@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(buildcfg)
diff --git a/tests/actions/vstudio/vc2010/test_link.lua b/tests/actions/vstudio/vc2010/test_link.lua
index 4f9b3768..0b93c1bb 100644
--- a/tests/actions/vstudio/vc2010/test_link.lua
+++ b/tests/actions/vstudio/vc2010/test_link.lua
@@ -13,11 +13,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "SharedLib"
 	end
 
@@ -221,7 +221,7 @@
 
 	function suite.excludeSiblings()
 		links { "MyProject2" }
-		test.createproject(sln)
+		test.createproject(wks)
 		kind "SharedLib"
 		prepare()
 		test.capture [[
@@ -241,7 +241,7 @@
 	function suite.includeSiblings_onNoImplicitLink()
 		flags { "NoImplicitLink" }
 		links { "MyProject2" }
-		test.createproject(sln)
+		test.createproject(wks)
 		kind "SharedLib"
 		prepare()
 		test.capture [[
diff --git a/tests/actions/vstudio/vc2010/test_manifest.lua b/tests/actions/vstudio/vc2010/test_manifest.lua
index aac95d2c..6d5138a5 100644
--- a/tests/actions/vstudio/vc2010/test_manifest.lua
+++ b/tests/actions/vstudio/vc2010/test_manifest.lua
@@ -13,11 +13,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "ConsoleApp"
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_nmake_props.lua b/tests/actions/vstudio/vc2010/test_nmake_props.lua
index f30a41a7..ebae8a9e 100644
--- a/tests/actions/vstudio/vc2010/test_nmake_props.lua
+++ b/tests/actions/vstudio/vc2010/test_nmake_props.lua
@@ -12,11 +12,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "Makefile"
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_output_props.lua b/tests/actions/vstudio/vc2010/test_output_props.lua
index 63cc4ca9..a17965bd 100755
--- a/tests/actions/vstudio/vc2010/test_output_props.lua
+++ b/tests/actions/vstudio/vc2010/test_output_props.lua
@@ -12,11 +12,11 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc2010/test_platform_toolset.lua b/tests/actions/vstudio/vc2010/test_platform_toolset.lua
index 6e618956..09c5fa4d 100644
--- a/tests/actions/vstudio/vc2010/test_platform_toolset.lua
+++ b/tests/actions/vstudio/vc2010/test_platform_toolset.lua
@@ -12,11 +12,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2012"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		files "hello.cpp"
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_project_configs.lua b/tests/actions/vstudio/vc2010/test_project_configs.lua
index f6ee4de2..6f84a0c9 100755
--- a/tests/actions/vstudio/vc2010/test_project_configs.lua
+++ b/tests/actions/vstudio/vc2010/test_project_configs.lua
@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc2010.projectConfigurations(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_project_refs.lua b/tests/actions/vstudio/vc2010/test_project_refs.lua
index 236ca463..cbe577ed 100644
--- a/tests/actions/vstudio/vc2010/test_project_refs.lua
+++ b/tests/actions/vstudio/vc2010/test_project_refs.lua
@@ -13,17 +13,17 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		uuid "00112233-4455-6677-8888-99AABBCCDDEE"
-		test.createproject(sln)
+		test.createproject(wks)
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 2)
+		prj = premake.solution.getproject(wks, 2)
 		vc2010.projectReferences(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_prop_sheet.lua b/tests/actions/vstudio/vc2010/test_prop_sheet.lua
index 5e24838f..1d4876a2 100755
--- a/tests/actions/vstudio/vc2010/test_prop_sheet.lua
+++ b/tests/actions/vstudio/vc2010/test_prop_sheet.lua
@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc2010/test_resource_compile.lua b/tests/actions/vstudio/vc2010/test_resource_compile.lua
index a7c0fd32..c1fb1465 100755
--- a/tests/actions/vstudio/vc2010/test_resource_compile.lua
+++ b/tests/actions/vstudio/vc2010/test_resource_compile.lua
@@ -13,11 +13,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2010.esc)
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/actions/vstudio/vc2010/test_rule_vars.lua b/tests/actions/vstudio/vc2010/test_rule_vars.lua
index 257b81b0..42b97b39 100644
--- a/tests/actions/vstudio/vc2010/test_rule_vars.lua
+++ b/tests/actions/vstudio/vc2010/test_rule_vars.lua
@@ -15,11 +15,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		rule "MyRule"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		rules { "MyRule" }
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_user_file.lua b/tests/actions/vstudio/vc2010/test_user_file.lua
index 9689cde0..766a9d1b 100644
--- a/tests/actions/vstudio/vc2010/test_user_file.lua
+++ b/tests/actions/vstudio/vc2010/test_user_file.lua
@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		local prj = test.getproject(sln, 1)
+		local prj = test.getproject(wks, 1)
 		vc2010.generateUser(prj)
 	end
 
diff --git a/tests/actions/vstudio/vc2010/test_vectorextensions.lua b/tests/actions/vstudio/vc2010/test_vectorextensions.lua
index ab93452d..6da5803e 100644
--- a/tests/actions/vstudio/vc2010/test_vectorextensions.lua
+++ b/tests/actions/vstudio/vc2010/test_vectorextensions.lua
@@ -10,11 +10,11 @@
 	local m = premake.vstudio.vc2010
 
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/api/test_boolean_kind.lua b/tests/api/test_boolean_kind.lua
index 4d99105e..77ab4bdf 100644
--- a/tests/api/test_boolean_kind.lua
+++ b/tests/api/test_boolean_kind.lua
@@ -18,7 +18,7 @@
 			kind = "boolean",
 			scope = "project",
 		}
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()
diff --git a/tests/api/test_directory_kind.lua b/tests/api/test_directory_kind.lua
index ff30b5c8..a7a5cfcc 100644
--- a/tests/api/test_directory_kind.lua
+++ b/tests/api/test_directory_kind.lua
@@ -19,7 +19,7 @@
 			list = true,
 			scope = "project"
 		}
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()
diff --git a/tests/api/test_list_kind.lua b/tests/api/test_list_kind.lua
index 66333853..9596ebeb 100644
--- a/tests/api/test_list_kind.lua
+++ b/tests/api/test_list_kind.lua
@@ -21,7 +21,7 @@
 			scope = "project",
 			allowed = { "first", "second", "third" }
 		}
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()
diff --git a/tests/api/test_path_kind.lua b/tests/api/test_path_kind.lua
index 8779109b..a29a1879 100644
--- a/tests/api/test_path_kind.lua
+++ b/tests/api/test_path_kind.lua
@@ -15,11 +15,11 @@
 
 	function suite.setup()
 		api.register {
-			name = "testapi", 
-			kind = "path", 
+			name = "testapi",
+			kind = "path",
 			scope = "project"
 		}
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()
diff --git a/tests/api/test_string_kind.lua b/tests/api/test_string_kind.lua
index ecceb0ae..0cf4dfa2 100644
--- a/tests/api/test_string_kind.lua
+++ b/tests/api/test_string_kind.lua
@@ -14,13 +14,13 @@
 --
 
 	function suite.setup()
-		api.register { 
-			name = "testapi", 
-			kind = "string", 
+		api.register {
+			name = "testapi",
+			kind = "string",
 			scope = "project",
 			allowed = { "One", "Two", "Three" },
 		}
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()
@@ -54,7 +54,7 @@
 --
 
 	function suite.raisesError_onTableValue()
-		ok, err = pcall(function () 
+		ok, err = pcall(function ()
 			testapi { "One", "Two" }
 		end)
 		test.isfalse(ok)
@@ -66,7 +66,7 @@
 --
 
 	function suite.raisesError_onDisallowedValue()
-		ok, err = pcall(function () 
+		ok, err = pcall(function ()
 			testapi "NotAllowed"
 		end)
 		test.isfalse(ok)
diff --git a/tests/api/test_table_kind.lua b/tests/api/test_table_kind.lua
index 1dc5a694..28f5d455 100644
--- a/tests/api/test_table_kind.lua
+++ b/tests/api/test_table_kind.lua
@@ -14,7 +14,7 @@
 
 	function suite.setup()
 		api.register { name = "testapi", kind = "table", scope = "project" }
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()
diff --git a/tests/base/test_detoken.lua b/tests/base/test_detoken.lua
index 0c3e56c2..b4444b82 100644
--- a/tests/base/test_detoken.lua
+++ b/tests/base/test_detoken.lua
@@ -52,8 +52,8 @@
 --
 
 	function suite.expandsNestedTokens()
-		environ.sln = { name="MySolution%{'X'}" }
-		x = detoken.expand("%{sln.name}", environ)
+		environ.wks = { name="MySolution%{'X'}" }
+		x = detoken.expand("%{wks.name}", environ)
 		test.isequal("MySolutionX", x)
 	end
 
diff --git a/tests/base/test_filename.lua b/tests/base/test_filename.lua
index 66a78b14..71cde306 100644
--- a/tests/base/test_filename.lua
+++ b/tests/base/test_filename.lua
@@ -14,14 +14,14 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = test.getproject(sln, 1)
+		prj = test.getproject(wks, 1)
 	end
 
 
@@ -72,7 +72,7 @@
 
 	function suite.worksWithSolution()
 		prepare()
-		test.isequal("MySolution", path.getname(p.filename(sln)))
+		test.isequal("MySolution", path.getname(p.filename(wks)))
 	end
 
 
diff --git a/tests/config/test_linkinfo.lua b/tests/config/test_linkinfo.lua
index bbba416e..5153eeff 100755
--- a/tests/config/test_linkinfo.lua
+++ b/tests/config/test_linkinfo.lua
@@ -12,11 +12,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "test"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "StaticLib"
 		system "Windows"
 	end
diff --git a/tests/config/test_links.lua b/tests/config/test_links.lua
index 76c04419..9d3f3309 100755
--- a/tests/config/test_links.lua
+++ b/tests/config/test_links.lua
@@ -12,12 +12,12 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "test"
 		_OS = "windows"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(kind, part, linkage)
diff --git a/tests/config/test_targetinfo.lua b/tests/config/test_targetinfo.lua
index 92239534..e4d39064 100755
--- a/tests/config/test_targetinfo.lua
+++ b/tests/config/test_targetinfo.lua
@@ -12,11 +12,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "test"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		system "macosx"
 	end
 
diff --git a/tests/oven/test_filtering.lua b/tests/oven/test_filtering.lua
index 56a855d1..92b1a5d8 100644
--- a/tests/oven/test_filtering.lua
+++ b/tests/oven/test_filtering.lua
@@ -8,7 +8,7 @@
 	local oven = premake.oven
 	local solution = premake.solution
 
-	local sln, prj
+	local wks, prj
 
 
 --
@@ -16,12 +16,12 @@
 --
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		sln = test.getsolution(sln)
-		prj = test.getproject(sln, 1)
+		wks = test.getsolution(wks)
+		prj = test.getproject(wks, 1)
 	end
 
 
diff --git a/tests/oven/test_objdirs.lua b/tests/oven/test_objdirs.lua
index aa3a7b22..7583fcd0 100644
--- a/tests/oven/test_objdirs.lua
+++ b/tests/oven/test_objdirs.lua
@@ -7,7 +7,7 @@
 	local suite = test.declare("oven_objdirs")
 	local oven = premake.oven
 
-	local sln, prj
+	local wks, prj
 
 ---
 -- Setup
@@ -24,7 +24,7 @@
 
 
 	function suite.singleProject_noPlatforms()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		prj = project "MyProject"
 
@@ -34,18 +34,18 @@
 
 
 	function suite.multipleProjects_noPlatforms()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		prj = project "MyProject"
 		project "MyProject2"
 
-		test.createproject(sln)
+		test.createproject(wks)
 		test.isequal("obj/Debug/MyProject", result("Debug"))
 	end
 
 
 	function suite.singleProject_withPlatforms()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		platforms { "x86", "x86_64" }
 		prj = project "MyProject"
@@ -55,7 +55,7 @@
 
 
 	function suite.singleProject_uniqueByTokens_noPlatforms()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		prj = project "MyProject"
 		objdir "obj/%{cfg.buildcfg}"
@@ -65,7 +65,7 @@
 
 
 	function suite.singleProject_uniqueByTokens_withPlatforms()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		platforms { "x86", "x86_64" }
 		prj = project "MyProject"
@@ -76,7 +76,7 @@
 
 
 	function suite.allowOverlap_onPrefixCode()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		platforms { "x86", "x86_64" }
 		prj = project "MyProject"
diff --git a/tests/project/test_config_maps.lua b/tests/project/test_config_maps.lua
index f4e77ee1..c07b35da 100644
--- a/tests/project/test_config_maps.lua
+++ b/tests/project/test_config_maps.lua
@@ -11,15 +11,15 @@
 -- Setup and teardown
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		configurations { "Debug", "Release" }
 	end
 
 	local function prepare(buildcfg, platform)
-		prj = sln.projects[1]
+		prj = wks.projects[1]
 		cfg = test.getconfig(prj, buildcfg or "Debug", platform)
 	end
 
diff --git a/tests/project/test_eachconfig.lua b/tests/project/test_eachconfig.lua
index 2ec0e265..bcd4b9d8 100755
--- a/tests/project/test_eachconfig.lua
+++ b/tests/project/test_eachconfig.lua
@@ -12,10 +12,10 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 	end
 
 	local function prepare(buildcfgs)
@@ -23,7 +23,7 @@
 		if buildcfgs then
 			configurations ( buildcfgs )
 		end
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		for cfg in premake.project.eachconfig(prj) do
 			_p(2,'%s:%s', cfg.buildcfg or "", cfg.platform or "")
 		end
diff --git a/tests/project/test_getconfig.lua b/tests/project/test_getconfig.lua
index 2e52a058..6f74d6fa 100755
--- a/tests/project/test_getconfig.lua
+++ b/tests/project/test_getconfig.lua
@@ -10,15 +10,15 @@
 -- Setup and teardown
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		configurations { "Debug", "Release" }
 	end
 
 	local function prepare(buildcfg, platform)
-		prj = sln.projects[1]
+		prj = wks.projects[1]
 		cfg = test.getconfig(prj, buildcfg or "Debug", platform)
 	end
 
diff --git a/tests/project/test_location.lua b/tests/project/test_location.lua
index e9a47038..eb67d1be 100644
--- a/tests/project/test_location.lua
+++ b/tests/project/test_location.lua
@@ -11,14 +11,14 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 	end
 
 
diff --git a/tests/project/test_sources.lua b/tests/project/test_sources.lua
index baa3e4d2..c5d52c93 100644
--- a/tests/project/test_sources.lua
+++ b/tests/project/test_sources.lua
@@ -12,13 +12,13 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	local cwd = os.getcwd()
 	local oldcwd
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 
 		-- We change the directory to get nice relative paths
 		oldcwd = os.getcwd()
diff --git a/tests/project/test_vpaths.lua b/tests/project/test_vpaths.lua
index 1f7fe7d7..84850b49 100644
--- a/tests/project/test_vpaths.lua
+++ b/tests/project/test_vpaths.lua
@@ -12,10 +12,10 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function run()
diff --git a/tests/solution/test_eachconfig.lua b/tests/solution/test_eachconfig.lua
index 5b3e46aa..6f6b221b 100644
--- a/tests/solution/test_eachconfig.lua
+++ b/tests/solution/test_eachconfig.lua
@@ -12,14 +12,14 @@
 -- Setup and teardown
 --
 
-	local sln
+	local wks
 	function suite.setup()
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 	end
 
 	local function prepare()
 		_p(2,"-")
-		for cfg in premake.solution.eachconfig(sln) do
+		for cfg in premake.solution.eachconfig(wks) do
 			_p(2, "%s:%s", cfg.buildcfg or "", cfg.platform or "")
 		end
 		_p(2,"-")
diff --git a/tests/solution/test_location.lua b/tests/solution/test_location.lua
index 3c1bae5a..2488eb5f 100644
--- a/tests/solution/test_location.lua
+++ b/tests/solution/test_location.lua
@@ -11,14 +11,14 @@
 -- Setup and teardown
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 	end
 
 	local function prepare()
-		sln = test.getsolution(sln)
+		wks = test.getsolution(wks)
 	end
 
 
@@ -29,7 +29,7 @@
 
 	function suite.usesScriptLocation_onNoLocation()
 		prepare()
-		test.isequal(os.getcwd(), sln.location)
+		test.isequal(os.getcwd(), wks.location)
 	end
 
 
@@ -40,5 +40,5 @@
 	function suite.usesLocation_onLocationSet()
 		location "build"
 		prepare()
-		test.isequal(path.join(os.getcwd(), "build"), sln.location)
+		test.isequal(path.join(os.getcwd(), "build"), wks.location)
 	end
diff --git a/tests/solution/test_objdirs.lua b/tests/solution/test_objdirs.lua
index 4ffb342e..a26f1933 100644
--- a/tests/solution/test_objdirs.lua
+++ b/tests/solution/test_objdirs.lua
@@ -11,16 +11,16 @@
 -- Setup and teardown
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "test"
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		system "macosx"
 	end
 
 	local function result()
-		local platforms = sln.platforms or {}
+		local platforms = wks.platforms or {}
 		local prj = project("MyProject")
 		local cfg = test.getconfig(prj, "Debug", platforms[1])
 		return premake.project.getrelative(cfg.project, cfg.objdir)
diff --git a/tests/test_premake.lua b/tests/test_premake.lua
index 7a78bc5c..33479873 100644
--- a/tests/test_premake.lua
+++ b/tests/test_premake.lua
@@ -1,23 +1,24 @@
 --
 -- tests/test_premake.lua
 -- Automated test suite for the Premake support functions.
--- Copyright (c) 2008-2009 Jason Perkins and the Premake project
+-- Copyright (c) 2008-2015 Jason Perkins and the Premake project
 --
 
 
-	T.premake = {}
-	local suite = T.premake
+	local suite = test.declare("premake")
+
+	local p = premake
 
 
 --
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		location "MyLocation"
-		prj = premake.solution.getproject(sln, 1)
+		prj = p.workspace.getproject(wks, 1)
 	end
 
 
@@ -26,11 +27,11 @@
 --
 
 	function suite.generate_OpensCorrectFile()
-		premake.generate(prj, ".prj", function () end)
+		p.generate(prj, ".prj", function () end)
 		test.openedfile(path.join(os.getcwd(), "MyLocation/MyProject.prj"))
 	end
 
 	function T.premake.generate_ClosesFile()
-		premake.generate(prj, ".prj", function () end)
+		p.generate(prj, ".prj", function () end)
 		test.closedfile(true)
 	end
diff --git a/tests/test_stress.lua b/tests/test_stress.lua
index f743e29c..5725f1c3 100644
--- a/tests/test_stress.lua
+++ b/tests/test_stress.lua
@@ -15,7 +15,7 @@ profiler = newProfiler()
 profiler:start()
 
 
-solution "MySolution"
+workspace "MyWorkspace"
 	location "build"
 
 	for i = 1, numbuildcfgs do
diff --git a/tests/testfx.lua b/tests/testfx.lua
index 6abbaef7..2964311a 100644
--- a/tests/testfx.lua
+++ b/tests/testfx.lua
@@ -260,8 +260,8 @@
 	p.alias(test, "createWorkspace", "createsolution")
 
 
-	function test.createproject(sln)
-		local n = #sln.projects + 1
+	function test.createproject(wks)
+		local n = #wks.projects + 1
 		if n == 1 then n = "" end
 
 		local prj = project ("MyProject" .. n)
@@ -271,22 +271,24 @@
 	end
 
 
-	function test.getsolution(sln)
+	function test.getWorkspace(wks)
 		p.oven.bake()
-		return p.global.getWorkspace(sln.name)
+		return p.global.getWorkspace(wks.name)
 	end
 
+	p.alias(test, "getWorkspace", "getsolution")
 
-	function test.getproject(sln, i)
-		sln = test.getsolution(sln)
-		return premake.solution.getproject(sln, i or 1)
+
+	function test.getproject(wks, i)
+		wks = test.getWorkspace(wks)
+		return p.workspace.getproject(wks, i or 1)
 	end
 
 
 	function test.getconfig(prj, buildcfg, platform)
-		sln = test.getsolution(prj.solution)
-		prj = premake.solution.getproject(sln, prj.name)
-		return premake.project.getconfig(prj, buildcfg, platform)
+		local wks = test.getWorkspace(prj.workspace)
+		prj = p.workspace.getproject(wks, prj.name)
+		return p.project.getconfig(prj, buildcfg, platform)
 	end
 
 
diff --git a/tests/tools/test_dotnet.lua b/tests/tools/test_dotnet.lua
index a7964eb0..005d1a50 100644
--- a/tests/tools/test_dotnet.lua
+++ b/tests/tools/test_dotnet.lua
@@ -12,10 +12,10 @@
 -- Setup/teardown
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
diff --git a/tests/tools/test_gcc.lua b/tests/tools/test_gcc.lua
index 770e472a..59d3aecd 100644
--- a/tests/tools/test_gcc.lua
+++ b/tests/tools/test_gcc.lua
@@ -14,10 +14,10 @@
 -- Setup/teardown
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		system "Linux"
 	end
 
@@ -345,7 +345,7 @@
 	function suite.links_onStaticSiblingLibrary()
 		links { "MyProject2" }
 
-		test.createproject(sln)
+		test.createproject(wks)
 		system "Linux"
 		kind "StaticLib"
 		targetdir "lib"
@@ -362,7 +362,7 @@
 	function suite.links_onSharedSiblingLibrary()
 		links { "MyProject2" }
 
-		test.createproject(sln)
+		test.createproject(wks)
 		system "Linux"
 		kind "SharedLib"
 		targetdir "lib"
diff --git a/tests/tools/test_msc.lua b/tests/tools/test_msc.lua
index 37c8f26d..04ce5d16 100644
--- a/tests/tools/test_msc.lua
+++ b/tests/tools/test_msc.lua
@@ -13,10 +13,10 @@
 -- Setup/teardown
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "SharedLib"
 	end
 
diff --git a/tests/tools/test_snc.lua b/tests/tools/test_snc.lua
index f2a99ffc..2acba0f8 100644
--- a/tests/tools/test_snc.lua
+++ b/tests/tools/test_snc.lua
@@ -13,10 +13,10 @@
 -- Setup/teardown
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		system "PS3"
 	end
 
@@ -147,7 +147,7 @@
 	function suite.links_onStaticSiblingLibrary()
 		links { "MyProject2" }
 
-		test.createproject(sln)
+		test.createproject(wks)
 		system "Linux"
 		kind "StaticLib"
 		location "MyProject2"