diff --git a/Makefile b/Makefile
index ce8686f11..ed0e90900 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ all:
 	cd renderdoc && $(MAKE) librenderdoc.so
 	cd renderdoccmd && $(MAKE) bin/renderdoccmd
 	cd qrenderdoc && qmake "CONFIG+=debug" && $(MAKE)
-	cp renderdoc/librenderdoc.so renderdoccmd/bin/renderdoccmd bin/
+	cp renderdoc/librenderdoc.so renderdoc/driver/vulkan/renderdoc.json renderdoccmd/bin/renderdoccmd bin/
 
 .PHONY: clean
 clean:
diff --git a/renderdoc/driver/vulkan/renderdoc.json b/renderdoc/driver/vulkan/renderdoc.json
index 0ec8dfb07..257853a7e 100644
--- a/renderdoc/driver/vulkan/renderdoc.json
+++ b/renderdoc/driver/vulkan/renderdoc.json
@@ -3,7 +3,7 @@
     "layer" : {
         "name": "RenderDoc",
         "type": "GLOBAL",
-        "library_path": "./libVKLayerRenderdoc.so",
+        "library_path": "./librenderdoc.so",
         "abi_versions": "1.0.0",
         "implementation_version": "1.0.0",
         "description": "Debugging capture layer for RenderDoc"
diff --git a/renderdoc/driver/vulkan/vk_tracelayer.cpp b/renderdoc/driver/vulkan/vk_tracelayer.cpp
index 7d813c5e2..9bce7c036 100644
--- a/renderdoc/driver/vulkan/vk_tracelayer.cpp
+++ b/renderdoc/driver/vulkan/vk_tracelayer.cpp
@@ -89,7 +89,7 @@ static const VkLayerProperties physLayers[] = {
 		"RenderDoc",
 			VK_API_VERSION,
 			VK_MAKE_VERSION(RENDERDOC_VERSION_MAJOR, RENDERDOC_VERSION_MINOR, 0),
-			"layer: implements RenderDoc tracing",
+			"Debugging capture layer for RenderDoc",
 	}
 };
 
diff --git a/renderdoc/os/linux/linux_process.cpp b/renderdoc/os/linux/linux_process.cpp
index 6649acf19..b0fbfdd44 100644
--- a/renderdoc/os/linux/linux_process.cpp
+++ b/renderdoc/os/linux/linux_process.cpp
@@ -275,21 +275,20 @@ uint32_t Process::LaunchAndInjectIntoProcess(const char *app, const char *workin
 			memcpy(envp[i], environ[srci], len);
 			strcat(envp[i], ":");
 			strcat(envp[i], localpath.c_str());
-			strcat(envp[i], "/../../renderdoc/driver/vulkan");
 		}
 		else if(!strncmp(environ[srci], "VK_DEVICE_LAYERS=", sizeof("VK_DEVICE_LAYERS=")-1))
 		{
 			devicelayers = true;
-			envp[i] = new char[len+sizeof(":Renderdoc")];
+			envp[i] = new char[len+sizeof(":RenderDoc")];
 			memcpy(envp[i], environ[srci], len);
-			strcat(envp[i], ":Renderdoc");
+			strcat(envp[i], ":RenderDoc");
 		}
 		else if(!strncmp(environ[srci], "VK_INSTANCE_LAYERS=", sizeof("VK_INSTANCE_LAYERS=")-1))
 		{
 			instancelayers = true;
-			envp[i] = new char[len+sizeof(":Renderdoc")];
+			envp[i] = new char[len+sizeof(":RenderDoc")];
 			memcpy(envp[i], environ[srci], len);
-			strcat(envp[i], ":Renderdoc");
+			strcat(envp[i], ":RenderDoc");
 		}
 		else if(!strncmp(environ[srci], "RENDERDOC_", sizeof("RENDERDOC_")-1))
 		{
@@ -326,7 +325,7 @@ uint32_t Process::LaunchAndInjectIntoProcess(const char *app, const char *workin
 
 	if(!layerdirs)
 	{
-		string e = StringFormat::Fmt("VK_LAYER_DIRS=%s/../../renderdoc/driver/vulkan", localpath.c_str());
+		string e = StringFormat::Fmt("VK_LAYER_DIRS=%s", localpath.c_str());
 		envp[i] = new char[e.length()+1];
 		memcpy(envp[i], e.c_str(), e.length()+1);
 		i++;
@@ -335,7 +334,7 @@ uint32_t Process::LaunchAndInjectIntoProcess(const char *app, const char *workin
 
 	if(!devicelayers)
 	{
-		string e = StringFormat::Fmt("VK_DEVICE_LAYERS=Renderdoc");
+		string e = StringFormat::Fmt("VK_DEVICE_LAYERS=RenderDoc");
 		envp[i] = new char[e.length()+1];
 		memcpy(envp[i], e.c_str(), e.length()+1);
 		i++;
@@ -344,7 +343,7 @@ uint32_t Process::LaunchAndInjectIntoProcess(const char *app, const char *workin
 
 	if(!instancelayers)
 	{
-		string e = StringFormat::Fmt("VK_INSTANCE_LAYERS=Renderdoc");
+		string e = StringFormat::Fmt("VK_INSTANCE_LAYERS=RenderDoc");
 		envp[i] = new char[e.length()+1];
 		memcpy(envp[i], e.c_str(), e.length()+1);
 		i++;