6 files changed, 17 insertions, 16 deletions
diff --git a/test/functional/plugin/editorconfig_spec.lua b/test/functional/plugin/editorconfig_spec.lua
index 2c9ce7ae1a..0689cd09d3 100644
--- a/test/functional/plugin/editorconfig_spec.lua
+++ b/test/functional/plugin/editorconfig_spec.lua
@@ -13,7 +13,7 @@ local function test_case(name, expected)
   local filename = testdir .. pathsep .. name
   command('edit ' .. filename)
   for opt, val in pairs(expected) do
-    eq(val, meths.get_option_value(opt, { buf = 0 }), name)
+    eq(val, meths.nvim_get_option_value(opt, { buf = 0 }), name)
   end
 end
 
@@ -195,15 +195,15 @@ But not this one
   end)
 
   it('can be disabled globally', function()
-    meths.set_var('editorconfig', false)
-    meths.set_option_value('shiftwidth', 42, {})
+    meths.nvim_set_var('editorconfig', false)
+    meths.nvim_set_option_value('shiftwidth', 42, {})
     test_case('3_space.txt', { shiftwidth = 42 })
   end)
 
   it('can be disabled per-buffer', function()
-    meths.set_option_value('shiftwidth', 42, {})
+    meths.nvim_set_option_value('shiftwidth', 42, {})
     local bufnr = funcs.bufadd(testdir .. pathsep .. '3_space.txt')
-    meths.buf_set_var(bufnr, 'editorconfig', false)
+    meths.nvim_buf_set_var(bufnr, 'editorconfig', false)
     test_case('3_space.txt', { shiftwidth = 42 })
     test_case('4_space.py', { shiftwidth = 4 })
   end)
diff --git a/test/functional/plugin/lsp/incremental_sync_spec.lua b/test/functional/plugin/lsp/incremental_sync_spec.lua
index 9b33f4451e..ec918ed514 100644
--- a/test/functional/plugin/lsp/incremental_sync_spec.lua
+++ b/test/functional/plugin/lsp/incremental_sync_spec.lua
@@ -62,7 +62,7 @@ local function test_edit(
   offset_encoding = offset_encoding or 'utf-16'
   line_ending = line_ending or '\n'
 
-  meths.buf_set_lines(0, 0, -1, true, prev_buffer)
+  meths.nvim_buf_set_lines(0, 0, -1, true, prev_buffer)
   exec_lua('return test_register(...)', 0, 'test1', offset_encoding, line_ending)
 
   for _, edit in ipairs(edit_operations) do
diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index d794a34463..43bfb89e81 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -363,9 +363,9 @@ describe('LSP', function()
         end,
         on_handler = function(_, _, ctx)
           if ctx.method == 'finish' then
-            eq('basic_init', meths.get_var('lsp_attached'))
+            eq('basic_init', meths.nvim_get_var('lsp_attached'))
             exec_lua('return lsp.buf_detach_client(BUFFER, TEST_RPC_CLIENT_ID)')
-            eq('basic_init', meths.get_var('lsp_detached'))
+            eq('basic_init', meths.nvim_get_var('lsp_detached'))
             client.stop()
           end
         end,
diff --git a/test/functional/plugin/matchparen_spec.lua b/test/functional/plugin/matchparen_spec.lua
index 1c4e11d30b..2bda41359b 100644
--- a/test/functional/plugin/matchparen_spec.lua
+++ b/test/functional/plugin/matchparen_spec.lua
@@ -22,7 +22,7 @@ describe('matchparen', function()
 
   it('uses correct column after i_<Up>. Vim patch 7.4.1296', function()
     command('set noautoindent nosmartindent nocindent laststatus=0')
-    eq(1, meths.get_var('loaded_matchparen'))
+    eq(1, meths.nvim_get_var('loaded_matchparen'))
     feed('ivoid f_test()<cr>')
     feed('{<cr>')
     feed('}')
diff --git a/test/functional/plugin/msgpack_spec.lua b/test/functional/plugin/msgpack_spec.lua
index 985252fd75..bc1182afd3 100644
--- a/test/functional/plugin/msgpack_spec.lua
+++ b/test/functional/plugin/msgpack_spec.lua
@@ -526,17 +526,17 @@ describe('autoload/msgpack.vim', function()
     end)
 
     it('works for special v: values like v:true', function()
-      meths.set_var('true', true)
-      meths.set_var('false', false)
-      meths.set_var('nil', NIL)
+      meths.nvim_set_var('true', true)
+      meths.nvim_set_var('false', false)
+      meths.nvim_set_var('nil', NIL)
 
       nvim_command('let true2 = msgpack#deepcopy(true)')
       nvim_command('let false2 = msgpack#deepcopy(false)')
       nvim_command('let nil2 = msgpack#deepcopy(nil)')
 
-      eq(true, meths.get_var('true'))
-      eq(false, meths.get_var('false'))
-      eq(NIL, meths.get_var('nil'))
+      eq(true, meths.nvim_get_var('true'))
+      eq(false, meths.nvim_get_var('false'))
+      eq(NIL, meths.nvim_get_var('nil'))
     end)
   end)
 
diff --git a/test/functional/plugin/shada_spec.lua b/test/functional/plugin/shada_spec.lua
index 59ddd8f3ce..628ff968d7 100644
--- a/test/functional/plugin/shada_spec.lua
+++ b/test/functional/plugin/shada_spec.lua
@@ -2644,7 +2644,8 @@ describe('plugin/shada.vim', function()
     wshada('\004\000\009\147\000\196\002ab\196\001a')
     wshada_tmp('\004\000\009\147\000\196\002ab\196\001b')
 
-    local bufread_commands = meths.get_autocmds({ group = 'ShaDaCommands', event = 'BufReadCmd' })
+    local bufread_commands =
+      meths.nvim_get_autocmds({ group = 'ShaDaCommands', event = 'BufReadCmd' })
     eq(2, #bufread_commands--[[, vim.inspect(bufread_commands) ]])
 
     -- Need to set nohidden so that the buffer containing 'fname' is not unloaded