diff --git a/modules/raw/_preload.lua b/modules/raw/_preload.lua
index d133500e..9b8bc007 100644
--- a/modules/raw/_preload.lua
+++ b/modules/raw/_preload.lua
@@ -7,7 +7,7 @@ newaction
 	onsolution = function(sln)
 		require('raw')
 
-		premake.generate(sln, ".raw", premake.raw.solution)
+		premake.generate(sln, ".raw", premake.raw.workspace)
 	end,
 }
 
diff --git a/modules/raw/raw_action.lua b/modules/raw/raw_action.lua
index 211249cf..572d25cc 100644
--- a/modules/raw/raw_action.lua
+++ b/modules/raw/raw_action.lua
@@ -3,10 +3,10 @@ p.raw = { }
 local raw = p.raw
 local gvisited = { }
 
-function raw.solution(sln)
-	if not gvisited[sln.global] then
-		gvisited[sln.global] = true
-		raw.printTable({ global = sln.global })
+function raw.workspace(wks)
+	if not gvisited[wks.global] then
+		gvisited[wks.global] = true
+		raw.printTable({ global = wks.global })
 	end
 end
 
diff --git a/modules/vstudio/tests/vc2010/test_ensure_nuget_imports.lua b/modules/vstudio/tests/vc2010/test_ensure_nuget_imports.lua
index 9c3ce54e..8e9a3a21 100644
--- a/modules/vstudio/tests/vc2010/test_ensure_nuget_imports.lua
+++ b/modules/vstudio/tests/vc2010/test_ensure_nuget_imports.lua
@@ -22,7 +22,7 @@
 	end
 
 	local function prepare()
-		local prj = p.solution.getproject(wks, 1)
+		local prj = p.workspace.getproject(wks, 1)
 		vc2010.ensureNuGetPackageBuildImports(prj)
 	end
 
diff --git a/modules/vstudio/tests/vc2010/test_nuget_packages_config.lua b/modules/vstudio/tests/vc2010/test_nuget_packages_config.lua
index 45e41523..623c67e4 100644
--- a/modules/vstudio/tests/vc2010/test_nuget_packages_config.lua
+++ b/modules/vstudio/tests/vc2010/test_nuget_packages_config.lua
@@ -23,7 +23,7 @@
 	end
 
 	local function prepare()
-		local prj = p.solution.getproject(wks, 1)
+		local prj = p.workspace.getproject(wks, 1)
 		nuget2010.generatePackagesConfig(prj)
 	end
 
diff --git a/modules/vstudio/vs2005_csproj.lua b/modules/vstudio/vs2005_csproj.lua
index 0ce1c3f4..ef1ac5d2 100644
--- a/modules/vstudio/vs2005_csproj.lua
+++ b/modules/vstudio/vs2005_csproj.lua
@@ -447,7 +447,7 @@
 					-- <Reference Include="nunit.framework">
 
 					_x(2, '<Reference Include="%s">', path.getbasename(file))
-					_x(3, '<HintPath>%s</HintPath>', vstudio.path(prj, p.filename(prj.solution, string.format("packages\\%s.%s\\%s", id, packageAPIInfo.verbatimVersion or packageAPIInfo.version, file))))
+					_x(3, '<HintPath>%s</HintPath>', vstudio.path(prj, p.filename(prj.workspace, string.format("packages\\%s.%s\\%s", id, packageAPIInfo.verbatimVersion or packageAPIInfo.version, file))))
 
 					if config.isCopyLocal(prj, package, true) then
 						_p(3, '<Private>True</Private>')
diff --git a/modules/vstudio/vs2010_vcxproj.lua b/modules/vstudio/vs2010_vcxproj.lua
index b7579c9c..9a63c32c 100644
--- a/modules/vstudio/vs2010_vcxproj.lua
+++ b/modules/vstudio/vs2010_vcxproj.lua
@@ -1589,7 +1589,7 @@
 
 	local function nuGetTargetsFile(prj, package)
 		local packageAPIInfo = vstudio.nuget2010.packageAPIInfo(prj, package)
-		return p.vstudio.path(prj, p.filename(prj.solution, string.format("packages\\%s.%s\\build\\native\\%s.targets", vstudio.nuget2010.packageId(package), packageAPIInfo.verbatimVersion or packageAPIInfo.version, vstudio.nuget2010.packageId(package))))
+		return p.vstudio.path(prj, p.filename(prj.workspace, string.format("packages\\%s.%s\\build\\native\\%s.targets", vstudio.nuget2010.packageId(package), packageAPIInfo.verbatimVersion or packageAPIInfo.version, vstudio.nuget2010.packageId(package))))
 	end
 
 	function m.importNuGetTargets(prj)