diff --git a/src/buffers.lua b/src/buffers.lua
index a961667..d34d0ad 100644
--- a/src/buffers.lua
+++ b/src/buffers.lua
@@ -3,6 +3,7 @@ local state = require('codemp.state')
 
 local id_buffer_map = {}
 local buffer_id_map = {}
+local user_buffer_name = {}
 local ticks = {}
 
 local function create(name, content)
@@ -124,4 +125,5 @@ return {
 	map = id_buffer_map,
 	map_rev = buffer_id_map,
 	ticks = ticks,
+	users = user_buffer_name,
 }
diff --git a/src/workspace.lua b/src/workspace.lua
index 1f264ea..5968c59 100644
--- a/src/workspace.lua
+++ b/src/workspace.lua
@@ -6,7 +6,6 @@ local state = require('codemp.state')
 local window = require('codemp.window')
 
 local user_hl = {}
-local user_buffer = {}
 local tree_buf = nil
 local available_colors = { -- TODO these are definitely not portable!
 	"ErrorMsg",
@@ -42,11 +41,11 @@ local function register_cursor_handler(controller)
 					hi = available_colors[ math.random( #available_colors ) ],
 				}
 			end
-			local old_buffer = user_buffer[event.user]
+			local old_buffer = buffers.users[event.user]
 			if old_buffer ~= nil then
 				vim.api.nvim_buf_clear_namespace(old_buffer, user_hl[event.user].ns, 0, -1)
 			end
-			user_buffer[event.user] = event.buffer
+			buffers.users[event.user] = event.buffer
 			local buffer = buffers.map_rev[event.buffer]
 			if buffer ~= nil then
 				utils.multiline_highlight(