diff --git a/autoload/lightline/colorscheme/randombones.vim b/autoload/lightline/colorscheme/randombones.vim
index b57d38c..d59b132 100644
--- a/autoload/lightline/colorscheme/randombones.vim
+++ b/autoload/lightline/colorscheme/randombones.vim
@@ -1 +1 @@
-let g:lightline#colorscheme#randombones#palette = g:lightline#colorscheme#{g:randombones.name}#palette
+let g:lightline#colorscheme#randombones#palette = g:lightline#colorscheme#{g:randombones_colors_name}#palette
diff --git a/colors/randombones.vim b/colors/randombones.vim
index 78608c6..6c720ef 100644
--- a/colors/randombones.vim
+++ b/colors/randombones.vim
@@ -7,9 +7,10 @@ else
     let s:index = rand() % len(s:colorschemes)
 endif
 
-let g:randombones = s:colorschemes[s:index]
-if exists('g:randombones.background')
-    call zenbones#setup_colorscheme(g:randombones.name, g:randombones.background)
+let s:colorscheme = s:colorschemes[s:index]
+let g:randombones_colors_name = s:colorschemes[s:index].name
+if exists('s:colorscheme.background')
+    call zenbones#setup_colorscheme(g:randombones_colors_name, s:colorscheme.background)
 else
-    call zenbones#setup_colorscheme(g:randombones.name)
+    call zenbones#setup_colorscheme(g:randombones_colors_name)
 end
diff --git a/lua/lualine/themes/randombones.lua b/lua/lualine/themes/randombones.lua
index a879348..a887119 100644
--- a/lua/lualine/themes/randombones.lua
+++ b/lua/lualine/themes/randombones.lua
@@ -1 +1 @@
-return require("lualine.themes." .. vim.g.randombones.name)
+return require("lualine.themes." .. vim.g.randombones_colors_name)
diff --git a/lua/randombones/init.lua b/lua/randombones/init.lua
index bc9aa9c..37a953e 100644
--- a/lua/randombones/init.lua
+++ b/lua/randombones/init.lua
@@ -1 +1 @@
-return require(vim.g.randombones.name)
+return require(vim.g.randombones_colors_name)
diff --git a/lua/randombones/palette.lua b/lua/randombones/palette.lua
index 3321cd5..7ff517b 100644
--- a/lua/randombones/palette.lua
+++ b/lua/randombones/palette.lua
@@ -1 +1 @@
-return require(vim.g.randombones.name .. ".palette")
+return require(vim.g.randombones_colors_name .. ".palette")