test: typing for helpers.meths

12 files changed, 1381 insertions, 1229 deletions

diff --git a/test/functional/api/autocmd_spec.lua b/test/functional/api/autocmd_spec.lua
index 1590ca2eda..79a524d9eb 100644
--- a/test/functional/api/autocmd_spec.lua
+++ b/test/functional/api/autocmd_spec.lua
@@ -17,7 +17,7 @@ describe('autocmd api', function()
     it('validation', function()
       eq(
         "Cannot use both 'callback' and 'command'",
-        pcall_err(meths.create_autocmd, 'BufReadPost', {
+        pcall_err(meths.nvim_create_autocmd, 'BufReadPost', {
           pattern = '*.py,*.pyi',
           command = "echo 'Should Have Errored",
           callback = 'NotAllowed',
@@ -25,7 +25,7 @@ describe('autocmd api', function()
       )
       eq(
         "Cannot use both 'pattern' and 'buffer' for the same autocmd",
-        pcall_err(meths.create_autocmd, 'FileType', {
+        pcall_err(meths.nvim_create_autocmd, 'FileType', {
           command = 'let g:called = g:called + 1',
           buffer = 0,
           pattern = '*.py',
@@ -33,48 +33,48 @@ describe('autocmd api', function()
       )
       eq(
         "Required: 'event'",
-        pcall_err(meths.create_autocmd, {}, {
+        pcall_err(meths.nvim_create_autocmd, {}, {
           command = 'ls',
         })
       )
-      eq("Required: 'command' or 'callback'", pcall_err(meths.create_autocmd, 'FileType', {}))
+      eq("Required: 'command' or 'callback'", pcall_err(meths.nvim_create_autocmd, 'FileType', {}))
       eq(
         "Invalid 'desc': expected String, got Integer",
-        pcall_err(meths.create_autocmd, 'FileType', {
+        pcall_err(meths.nvim_create_autocmd, 'FileType', {
           command = 'ls',
           desc = 42,
         })
       )
       eq(
         "Invalid 'callback': expected Lua function or Vim function name, got Integer",
-        pcall_err(meths.create_autocmd, 'FileType', {
+        pcall_err(meths.nvim_create_autocmd, 'FileType', {
           callback = 0,
         })
       )
       eq(
         "Invalid 'event' item: expected String, got Array",
-        pcall_err(meths.create_autocmd, { 'FileType', {} }, {})
+        pcall_err(meths.nvim_create_autocmd, { 'FileType', {} }, {})
       )
       eq(
         "Invalid 'group': 0",
-        pcall_err(meths.create_autocmd, 'FileType', {
+        pcall_err(meths.nvim_create_autocmd, 'FileType', {
           group = 0,
           command = 'ls',
         })
       )
 
-      eq("Invalid 'event': 'foo'", pcall_err(meths.create_autocmd, 'foo', { command = '' }))
+      eq("Invalid 'event': 'foo'", pcall_err(meths.nvim_create_autocmd, 'foo', { command = '' }))
       eq(
         "Invalid 'event': 'VimEnter '",
-        pcall_err(meths.create_autocmd, 'VimEnter ', { command = '' })
+        pcall_err(meths.nvim_create_autocmd, 'VimEnter ', { command = '' })
       )
       eq(
         "Invalid 'event': 'VimEnter foo'",
-        pcall_err(meths.create_autocmd, 'VimEnter foo', { command = '' })
+        pcall_err(meths.nvim_create_autocmd, 'VimEnter foo', { command = '' })
       )
       eq(
         "Invalid 'event': 'BufAdd,BufDelete'",
-        pcall_err(meths.create_autocmd, 'BufAdd,BufDelete', { command = '' })
+        pcall_err(meths.nvim_create_autocmd, 'BufAdd,BufDelete', { command = '' })
       )
     end)
 
@@ -102,25 +102,25 @@ describe('autocmd api', function()
     end)
 
     it('allows passing buffer by key', function()
-      meths.set_var('called', 0)
+      meths.nvim_set_var('called', 0)
 
-      meths.create_autocmd('FileType', {
+      meths.nvim_create_autocmd('FileType', {
         command = 'let g:called = g:called + 1',
         buffer = 0,
       })
 
-      meths.command 'set filetype=txt'
-      eq(1, meths.get_var('called'))
+      meths.nvim_command 'set filetype=txt'
+      eq(1, meths.nvim_get_var('called'))
 
       -- switch to a new buffer
-      meths.command 'new'
-      meths.command 'set filetype=python'
+      meths.nvim_command 'new'
+      meths.nvim_command 'set filetype=python'
 
-      eq(1, meths.get_var('called'))
+      eq(1, meths.nvim_get_var('called'))
     end)
 
     it('does not allow passing invalid buffers', function()
-      local ok, msg = pcall(meths.create_autocmd, 'FileType', {
+      local ok, msg = pcall(meths.nvim_create_autocmd, 'FileType', {
         command = 'let g:called = g:called + 1',
         buffer = -1,
       })
@@ -145,7 +145,7 @@ describe('autocmd api', function()
     end)
 
     it('allow passing pattern and <buffer> in same pattern', function()
-      local ok = pcall(meths.create_autocmd, 'BufReadPost', {
+      local ok = pcall(meths.nvim_create_autocmd, 'BufReadPost', {
         pattern = '*.py,<buffer>',
         command = "echo 'Should Not Error'",
       })
@@ -154,42 +154,42 @@ describe('autocmd api', function()
     end)
 
     it('should handle multiple values as comma separated list', function()
-      meths.create_autocmd('BufReadPost', {
+      meths.nvim_create_autocmd('BufReadPost', {
         pattern = '*.py,*.pyi',
         command = "echo 'Should Not Have Errored'",
       })
 
       -- We should have one autocmd for *.py and one for *.pyi
-      eq(2, #meths.get_autocmds { event = 'BufReadPost' })
+      eq(2, #meths.nvim_get_autocmds { event = 'BufReadPost' })
     end)
 
     it('should handle multiple values as array', function()
-      meths.create_autocmd('BufReadPost', {
+      meths.nvim_create_autocmd('BufReadPost', {
         pattern = { '*.py', '*.pyi' },
         command = "echo 'Should Not Have Errored'",
       })
 
       -- We should have one autocmd for *.py and one for *.pyi
-      eq(2, #meths.get_autocmds { event = 'BufReadPost' })
+      eq(2, #meths.nvim_get_autocmds { event = 'BufReadPost' })
     end)
 
     describe('desc', function()
       it('can add description to one autocmd', function()
         local cmd = "echo 'Should Not Have Errored'"
         local desc = 'Can show description'
-        meths.create_autocmd('BufReadPost', {
+        meths.nvim_create_autocmd('BufReadPost', {
           pattern = '*.py',
           command = cmd,
           desc = desc,
         })
 
-        eq(desc, meths.get_autocmds { event = 'BufReadPost' }[1].desc)
-        eq(cmd, meths.get_autocmds { event = 'BufReadPost' }[1].command)
+        eq(desc, meths.nvim_get_autocmds { event = 'BufReadPost' }[1].desc)
+        eq(cmd, meths.nvim_get_autocmds { event = 'BufReadPost' }[1].command)
       end)
 
       it('can add description to one autocmd that uses a callback', function()
         local desc = 'Can show description'
-        meths.set_var('desc', desc)
+        meths.nvim_set_var('desc', desc)
 
         local result = exec_lua([[
           local callback = function() print 'Should Not Have Errored' end
@@ -218,17 +218,17 @@ describe('autocmd api', function()
           })
         ]])
 
-        eq(nil, meths.get_autocmds({ event = 'BufReadPost' })[1].desc)
+        eq(nil, meths.nvim_get_autocmds({ event = 'BufReadPost' })[1].desc)
       end)
 
       it('can add description to multiple autocmd', function()
-        meths.create_autocmd('BufReadPost', {
+        meths.nvim_create_autocmd('BufReadPost', {
           pattern = { '*.py', '*.pyi' },
           command = "echo 'Should Not Have Errored'",
           desc = 'Can show description',
         })
 
-        local aus = meths.get_autocmds { event = 'BufReadPost' }
+        local aus = meths.nvim_get_autocmds { event = 'BufReadPost' }
         eq(2, #aus)
         eq('Can show description', aus[1].desc)
         eq('Can show description', aus[2].desc)
@@ -237,19 +237,19 @@ describe('autocmd api', function()
 
     pending('script and verbose settings', function()
       it('marks API client', function()
-        meths.create_autocmd('BufReadPost', {
+        meths.nvim_create_autocmd('BufReadPost', {
           pattern = '*.py',
           command = "echo 'Should Not Have Errored'",
           desc = 'Can show description',
         })
 
-        local aus = meths.get_autocmds { event = 'BufReadPost' }
+        local aus = meths.nvim_get_autocmds { event = 'BufReadPost' }
         eq(1, #aus, aus)
       end)
     end)
 
     it('removes an autocommand if the callback returns true', function()
-      meths.set_var('some_condition', false)
+      meths.nvim_set_var('some_condition', false)
 
       exec_lua [[
       vim.api.nvim_create_autocmd("User", {
@@ -261,21 +261,21 @@ describe('autocmd api', function()
       })
       ]]
 
-      meths.exec_autocmds('User', { pattern = 'Test' })
+      meths.nvim_exec_autocmds('User', { pattern = 'Test' })
 
-      local aus = meths.get_autocmds({ event = 'User', pattern = 'Test' })
+      local aus = meths.nvim_get_autocmds({ event = 'User', pattern = 'Test' })
       local first = aus[1]
       eq(true, first.id > 0)
 
-      meths.set_var('some_condition', true)
-      meths.exec_autocmds('User', { pattern = 'Test' })
-      eq({}, meths.get_autocmds({ event = 'User', pattern = 'Test' }))
+      meths.nvim_set_var('some_condition', true)
+      meths.nvim_exec_autocmds('User', { pattern = 'Test' })
+      eq({}, meths.nvim_get_autocmds({ event = 'User', pattern = 'Test' }))
     end)
 
     it('receives an args table', function()
-      local group_id = meths.create_augroup('TestGroup', {})
+      local group_id = meths.nvim_create_augroup('TestGroup', {})
       -- Having an existing autocmd calling expand("<afile>") shouldn't change args #18964
-      meths.create_autocmd('User', {
+      meths.nvim_create_autocmd('User', {
         group = 'TestGroup',
         pattern = 'Te*',
         command = 'call expand("<afile>")',
@@ -291,7 +291,7 @@ describe('autocmd api', function()
         })
       ]]
 
-      meths.exec_autocmds('User', { pattern = 'Test pattern' })
+      meths.nvim_exec_autocmds('User', { pattern = 'Test pattern' })
       eq({
         id = autocmd_id,
         group = group_id,
@@ -299,7 +299,7 @@ describe('autocmd api', function()
         match = 'Test pattern',
         file = 'Test pattern',
         buf = 1,
-      }, meths.get_var('autocmd_args'))
+      }, meths.nvim_get_var('autocmd_args'))
 
       -- Test without a group
       autocmd_id = exec_lua [[
@@ -311,7 +311,7 @@ describe('autocmd api', function()
         })
       ]]
 
-      meths.exec_autocmds('User', { pattern = 'some_pat' })
+      meths.nvim_exec_autocmds('User', { pattern = 'some_pat' })
       eq({
         id = autocmd_id,
         group = nil,
@@ -319,7 +319,7 @@ describe('autocmd api', function()
         match = 'some_pat',
         file = 'some_pat',
         buf = 1,
-      }, meths.get_var('autocmd_args'))
+      }, meths.nvim_get_var('autocmd_args'))
     end)
 
     it('can receive arbitrary data', function()
@@ -361,43 +361,43 @@ describe('autocmd api', function()
     it('validation', function()
       eq(
         "Invalid 'group': 9997999",
-        pcall_err(meths.get_autocmds, {
+        pcall_err(meths.nvim_get_autocmds, {
           group = 9997999,
         })
       )
       eq(
         "Invalid 'group': 'bogus'",
-        pcall_err(meths.get_autocmds, {
+        pcall_err(meths.nvim_get_autocmds, {
           group = 'bogus',
         })
       )
       eq(
         "Invalid 'group': 0",
-        pcall_err(meths.get_autocmds, {
+        pcall_err(meths.nvim_get_autocmds, {
           group = 0,
         })
       )
       eq(
         "Invalid 'group': expected String or Integer, got Array",
-        pcall_err(meths.get_autocmds, {
+        pcall_err(meths.nvim_get_autocmds, {
           group = {},
         })
       )
       eq(
         "Invalid 'buffer': expected Integer or Array, got Boolean",
-        pcall_err(meths.get_autocmds, {
+        pcall_err(meths.nvim_get_autocmds, {
           buffer = true,
         })
       )
       eq(
         "Invalid 'event': expected String or Array",
-        pcall_err(meths.get_autocmds, {
+        pcall_err(meths.nvim_get_autocmds, {
           event = true,
         })
       )
       eq(
         "Invalid 'pattern': expected String or Array, got Boolean",
-        pcall_err(meths.get_autocmds, {
+        pcall_err(meths.nvim_get_autocmds, {
           pattern = true,
         })
       )
@@ -408,7 +408,7 @@ describe('autocmd api', function()
         command [[au! InsertEnter]]
         command [[au InsertEnter * :echo "1"]]
 
-        local aus = meths.get_autocmds { event = 'InsertEnter' }
+        local aus = meths.nvim_get_autocmds { event = 'InsertEnter' }
         eq(1, #aus)
       end)
 
@@ -417,7 +417,7 @@ describe('autocmd api', function()
         command [[au InsertEnter * :echo "1"]]
         command [[au InsertEnter * :echo "2"]]
 
-        local aus = meths.get_autocmds { event = 'InsertEnter' }
+        local aus = meths.nvim_get_autocmds { event = 'InsertEnter' }
         eq(2, #aus)
       end)
 
@@ -426,8 +426,8 @@ describe('autocmd api', function()
         command [[au InsertEnter * :echo "1"]]
         command [[au InsertEnter * :echo "2"]]
 
-        local string_aus = meths.get_autocmds { event = 'InsertEnter' }
-        local array_aus = meths.get_autocmds { event = { 'InsertEnter' } }
+        local string_aus = meths.nvim_get_autocmds { event = 'InsertEnter' }
+        local array_aus = meths.nvim_get_autocmds { event = { 'InsertEnter' } }
         eq(string_aus, array_aus)
       end)
 
@@ -437,7 +437,7 @@ describe('autocmd api', function()
         command [[au InsertEnter * :echo "1"]]
         command [[au InsertEnter * :echo "2"]]
 
-        local aus = meths.get_autocmds { event = { 'InsertEnter', 'InsertLeave' } }
+        local aus = meths.nvim_get_autocmds { event = { 'InsertEnter', 'InsertLeave' } }
         eq(2, #aus)
       end)
 
@@ -451,7 +451,7 @@ describe('autocmd api', function()
             \ })
         ]]
 
-        local aus = meths.get_autocmds { event = { 'InsertEnter', 'InsertLeave' } }
+        local aus = meths.nvim_get_autocmds { event = { 'InsertEnter', 'InsertLeave' } }
         local first = aus[1]
         eq(first.id, nil)
 
@@ -459,8 +459,8 @@ describe('autocmd api', function()
         local second = aus[2]
         neq(second.id, nil)
 
-        meths.del_autocmd(second.id)
-        local new_aus = meths.get_autocmds { event = { 'InsertEnter', 'InsertLeave' } }
+        meths.nvim_del_autocmd(second.id)
+        local new_aus = meths.nvim_get_autocmds { event = { 'InsertEnter', 'InsertLeave' } }
         eq(1, #new_aus)
         eq(first, new_aus[1])
       end)
@@ -469,7 +469,7 @@ describe('autocmd api', function()
         command [[au! InsertEnter]]
         command [[au InsertEnter * :echo "1"]]
 
-        local aus = meths.get_autocmds { event = 'InsertEnter' }
+        local aus = meths.nvim_get_autocmds { event = 'InsertEnter' }
         eq({
           {
             buflocal = false,
@@ -487,7 +487,7 @@ describe('autocmd api', function()
         command [[au InsertEnter <buffer=1> :echo "1"]]
         command [[au InsertEnter <buffer=2> :echo "2"]]
 
-        local aus = meths.get_autocmds { event = 'InsertEnter', buffer = 0 }
+        local aus = meths.nvim_get_autocmds { event = 'InsertEnter', buffer = 0 }
         eq({
           {
             buffer = 2,
@@ -499,7 +499,7 @@ describe('autocmd api', function()
           },
         }, aus)
 
-        aus = meths.get_autocmds { event = 'InsertEnter', buffer = 1 }
+        aus = meths.nvim_get_autocmds { event = 'InsertEnter', buffer = 1 }
         eq({
           {
             buffer = 1,
@@ -511,7 +511,7 @@ describe('autocmd api', function()
           },
         }, aus)
 
-        aus = meths.get_autocmds { event = 'InsertEnter', buffer = { 1, 2 } }
+        aus = meths.nvim_get_autocmds { event = 'InsertEnter', buffer = { 1, 2 } }
         eq({
           {
             buffer = 1,
@@ -533,50 +533,50 @@ describe('autocmd api', function()
 
         eq(
           "Invalid 'buffer': expected Integer or Array, got String",
-          pcall_err(meths.get_autocmds, { event = 'InsertEnter', buffer = 'foo' })
+          pcall_err(meths.nvim_get_autocmds, { event = 'InsertEnter', buffer = 'foo' })
         )
         eq(
           "Invalid 'buffer': expected Integer, got String",
-          pcall_err(meths.get_autocmds, { event = 'InsertEnter', buffer = { 'foo', 42 } })
+          pcall_err(meths.nvim_get_autocmds, { event = 'InsertEnter', buffer = { 'foo', 42 } })
         )
         eq(
           'Invalid buffer id: 42',
-          pcall_err(meths.get_autocmds, { event = 'InsertEnter', buffer = { 42 } })
+          pcall_err(meths.nvim_get_autocmds, { event = 'InsertEnter', buffer = { 42 } })
         )
 
         local bufs = {}
         for _ = 1, 257 do
-          table.insert(bufs, meths.create_buf(true, false))
+          table.insert(bufs, meths.nvim_create_buf(true, false))
         end
 
         eq(
           'Too many buffers (maximum of 256)',
-          pcall_err(meths.get_autocmds, { event = 'InsertEnter', buffer = bufs })
+          pcall_err(meths.nvim_get_autocmds, { event = 'InsertEnter', buffer = bufs })
         )
       end)
 
       it('returns autocmds when group is specified by id', function()
-        local auid = meths.create_augroup('nvim_test_augroup', { clear = true })
-        meths.create_autocmd('FileType', { group = auid, command = 'echo "1"' })
-        meths.create_autocmd('FileType', { group = auid, command = 'echo "2"' })
+        local auid = meths.nvim_create_augroup('nvim_test_augroup', { clear = true })
+        meths.nvim_create_autocmd('FileType', { group = auid, command = 'echo "1"' })
+        meths.nvim_create_autocmd('FileType', { group = auid, command = 'echo "2"' })
 
-        local aus = meths.get_autocmds { group = auid }
+        local aus = meths.nvim_get_autocmds { group = auid }
         eq(2, #aus)
 
-        local aus2 = meths.get_autocmds { group = auid, event = 'InsertEnter' }
+        local aus2 = meths.nvim_get_autocmds { group = auid, event = 'InsertEnter' }
         eq(0, #aus2)
       end)
 
       it('returns autocmds when group is specified by name', function()
         local auname = 'nvim_test_augroup'
-        meths.create_augroup(auname, { clear = true })
-        meths.create_autocmd('FileType', { group = auname, command = 'echo "1"' })
-        meths.create_autocmd('FileType', { group = auname, command = 'echo "2"' })
+        meths.nvim_create_augroup(auname, { clear = true })
+        meths.nvim_create_autocmd('FileType', { group = auname, command = 'echo "1"' })
+        meths.nvim_create_autocmd('FileType', { group = auname, command = 'echo "2"' })
 
-        local aus = meths.get_autocmds { group = auname }
+        local aus = meths.nvim_get_autocmds { group = auname }
         eq(2, #aus)
 
-        local aus2 = meths.get_autocmds { group = auname, event = 'InsertEnter' }
+        local aus2 = meths.nvim_get_autocmds { group = auname, event = 'InsertEnter' }
         eq(0, #aus2)
       end)
 
@@ -609,7 +609,7 @@ describe('autocmd api', function()
 
       it('can retrieve a callback from an autocmd', function()
         local content = 'I Am A Callback'
-        meths.set_var('content', content)
+        meths.nvim_set_var('content', content)
 
         local result = exec_lua([[
           local cb = function() return vim.g.content end
@@ -671,7 +671,7 @@ describe('autocmd api', function()
       end)
 
       it('returns all groups if no group is specified', function()
-        local aus = meths.get_autocmds { event = 'InsertEnter' }
+        local aus = meths.nvim_get_autocmds { event = 'InsertEnter' }
         if #aus ~= 4 then
           eq({}, aus)
         end
@@ -680,7 +680,7 @@ describe('autocmd api', function()
       end)
 
       it('returns only the group specified', function()
-        local aus = meths.get_autocmds {
+        local aus = meths.nvim_get_autocmds {
           event = 'InsertEnter',
           group = 'GroupOne',
         }
@@ -691,7 +691,7 @@ describe('autocmd api', function()
       end)
 
       it('returns only the group specified, multiple values', function()
-        local aus = meths.get_autocmds {
+        local aus = meths.nvim_get_autocmds {
           event = 'InsertEnter',
           group = 'GroupTwo',
         }
@@ -706,7 +706,7 @@ describe('autocmd api', function()
 
     describe('groups: 2', function()
       it('raises error for undefined augroup name', function()
-        local success, code = unpack(meths.exec_lua(
+        local success, code = unpack(meths.nvim_exec_lua(
           [[
           return {pcall(function()
             vim.api.nvim_create_autocmd("FileType", {
@@ -724,7 +724,7 @@ describe('autocmd api', function()
       end)
 
       it('raises error for undefined augroup id', function()
-        local success, code = unpack(meths.exec_lua(
+        local success, code = unpack(meths.nvim_exec_lua(
           [[
           return {pcall(function()
             -- Make sure the augroup is deleted
@@ -745,7 +745,7 @@ describe('autocmd api', function()
       end)
 
       it('raises error for invalid group type', function()
-        local success, code = unpack(meths.exec_lua(
+        local success, code = unpack(meths.nvim_exec_lua(
           [[
           return {pcall(function()
             vim.api.nvim_create_autocmd("FileType", {
@@ -763,7 +763,7 @@ describe('autocmd api', function()
       end)
 
       it('raises error for invalid pattern array', function()
-        local success, code = unpack(meths.exec_lua(
+        local success, code = unpack(meths.nvim_exec_lua(
           [[
           return {pcall(function()
             vim.api.nvim_create_autocmd("FileType", {
@@ -792,7 +792,7 @@ describe('autocmd api', function()
       end)
 
       it('returns for literal match', function()
-        local aus = meths.get_autocmds {
+        local aus = meths.nvim_get_autocmds {
           event = 'InsertEnter',
           pattern = '*',
         }
@@ -803,7 +803,7 @@ describe('autocmd api', function()
 
       it('returns for multiple matches', function()
         -- vim.api.nvim_get_autocmds
-        local aus = meths.get_autocmds {
+        local aus = meths.nvim_get_autocmds {
           event = 'InsertEnter',
           pattern = { '*.one', '*.two' },
         }
@@ -815,17 +815,17 @@ describe('autocmd api', function()
       end)
 
       it('should work for buffer autocmds', function()
-        local normalized_aus = meths.get_autocmds {
+        local normalized_aus = meths.nvim_get_autocmds {
           event = 'InsertEnter',
           pattern = '<buffer=1>',
         }
 
-        local raw_aus = meths.get_autocmds {
+        local raw_aus = meths.nvim_get_autocmds {
           event = 'InsertEnter',
           pattern = '<buffer>',
         }
 
-        local zero_aus = meths.get_autocmds {
+        local zero_aus = meths.nvim_get_autocmds {
           event = 'InsertEnter',
           pattern = '<buffer=0>',
         }
@@ -841,110 +841,110 @@ describe('autocmd api', function()
     it('validation', function()
       eq(
         "Invalid 'group': 9997999",
-        pcall_err(meths.exec_autocmds, 'FileType', {
+        pcall_err(meths.nvim_exec_autocmds, 'FileType', {
           group = 9997999,
         })
       )
       eq(
         "Invalid 'group': 'bogus'",
-        pcall_err(meths.exec_autocmds, 'FileType', {
+        pcall_err(meths.nvim_exec_autocmds, 'FileType', {
           group = 'bogus',
         })
       )
       eq(
         "Invalid 'group': expected String or Integer, got Array",
-        pcall_err(meths.exec_autocmds, 'FileType', {
+        pcall_err(meths.nvim_exec_autocmds, 'FileType', {
           group = {},
         })
       )
       eq(
         "Invalid 'group': 0",
-        pcall_err(meths.exec_autocmds, 'FileType', {
+        pcall_err(meths.nvim_exec_autocmds, 'FileType', {
           group = 0,
         })
       )
       eq(
         "Invalid 'buffer': expected Buffer, got Array",
-        pcall_err(meths.exec_autocmds, 'FileType', {
+        pcall_err(meths.nvim_exec_autocmds, 'FileType', {
           buffer = {},
         })
       )
       eq(
         "Invalid 'event' item: expected String, got Array",
-        pcall_err(meths.exec_autocmds, { 'FileType', {} }, {})
+        pcall_err(meths.nvim_exec_autocmds, { 'FileType', {} }, {})
       )
     end)
 
     it('can trigger builtin autocmds', function()
-      meths.set_var('autocmd_executed', false)
+      meths.nvim_set_var('autocmd_executed', false)
 
-      meths.create_autocmd('BufReadPost', {
+      meths.nvim_create_autocmd('BufReadPost', {
         pattern = '*',
         command = 'let g:autocmd_executed = v:true',
       })
 
-      eq(false, meths.get_var('autocmd_executed'))
-      meths.exec_autocmds('BufReadPost', {})
-      eq(true, meths.get_var('autocmd_executed'))
+      eq(false, meths.nvim_get_var('autocmd_executed'))
+      meths.nvim_exec_autocmds('BufReadPost', {})
+      eq(true, meths.nvim_get_var('autocmd_executed'))
     end)
 
     it('can trigger multiple patterns', function()
-      meths.set_var('autocmd_executed', 0)
+      meths.nvim_set_var('autocmd_executed', 0)
 
-      meths.create_autocmd('BufReadPost', {
+      meths.nvim_create_autocmd('BufReadPost', {
         pattern = '*',
         command = 'let g:autocmd_executed += 1',
       })
 
-      meths.exec_autocmds('BufReadPost', { pattern = { '*.lua', '*.vim' } })
-      eq(2, meths.get_var('autocmd_executed'))
+      meths.nvim_exec_autocmds('BufReadPost', { pattern = { '*.lua', '*.vim' } })
+      eq(2, meths.nvim_get_var('autocmd_executed'))
 
-      meths.create_autocmd('BufReadPre', {
+      meths.nvim_create_autocmd('BufReadPre', {
         pattern = { 'bar', 'foo' },
         command = 'let g:autocmd_executed += 10',
       })
 
-      meths.exec_autocmds('BufReadPre', { pattern = { 'foo', 'bar', 'baz', 'frederick' } })
-      eq(22, meths.get_var('autocmd_executed'))
+      meths.nvim_exec_autocmds('BufReadPre', { pattern = { 'foo', 'bar', 'baz', 'frederick' } })
+      eq(22, meths.nvim_get_var('autocmd_executed'))
     end)
 
     it('can pass the buffer', function()
-      meths.set_var('buffer_executed', -1)
-      eq(-1, meths.get_var('buffer_executed'))
+      meths.nvim_set_var('buffer_executed', -1)
+      eq(-1, meths.nvim_get_var('buffer_executed'))
 
-      meths.create_autocmd('BufLeave', {
+      meths.nvim_create_autocmd('BufLeave', {
         pattern = '*',
         command = 'let g:buffer_executed = +expand("<abuf>")',
       })
 
       -- Doesn't execute for other non-matching events
-      meths.exec_autocmds('CursorHold', { buffer = 1 })
-      eq(-1, meths.get_var('buffer_executed'))
+      meths.nvim_exec_autocmds('CursorHold', { buffer = 1 })
+      eq(-1, meths.nvim_get_var('buffer_executed'))
 
-      meths.exec_autocmds('BufLeave', { buffer = 1 })
-      eq(1, meths.get_var('buffer_executed'))
+      meths.nvim_exec_autocmds('BufLeave', { buffer = 1 })
+      eq(1, meths.nvim_get_var('buffer_executed'))
     end)
 
     it('can pass the filename, pattern match', function()
-      meths.set_var('filename_executed', 'none')
-      eq('none', meths.get_var('filename_executed'))
+      meths.nvim_set_var('filename_executed', 'none')
+      eq('none', meths.nvim_get_var('filename_executed'))
 
-      meths.create_autocmd('BufEnter', {
+      meths.nvim_create_autocmd('BufEnter', {
         pattern = '*.py',
         command = 'let g:filename_executed = expand("<afile>")',
       })
 
       -- Doesn't execute for other non-matching events
-      meths.exec_autocmds('CursorHold', { buffer = 1 })
-      eq('none', meths.get_var('filename_executed'))
+      meths.nvim_exec_autocmds('CursorHold', { buffer = 1 })
+      eq('none', meths.nvim_get_var('filename_executed'))
 
-      meths.command('edit __init__.py')
-      eq('__init__.py', meths.get_var('filename_executed'))
+      meths.nvim_command('edit __init__.py')
+      eq('__init__.py', meths.nvim_get_var('filename_executed'))
     end)
 
     it('cannot pass buf and fname', function()
       local ok = pcall(
-        meths.exec_autocmds,
+        meths.nvim_exec_autocmds,
         'BufReadPre',
         { pattern = 'literally_cannot_error.rs', buffer = 1 }
       )
@@ -952,73 +952,73 @@ describe('autocmd api', function()
     end)
 
     it('can pass the filename, exact match', function()
-      meths.set_var('filename_executed', 'none')
-      eq('none', meths.get_var('filename_executed'))
+      meths.nvim_set_var('filename_executed', 'none')
+      eq('none', meths.nvim_get_var('filename_executed'))
 
-      meths.command('edit other_file.txt')
-      meths.command('edit __init__.py')
-      eq('none', meths.get_var('filename_executed'))
+      meths.nvim_command('edit other_file.txt')
+      meths.nvim_command('edit __init__.py')
+      eq('none', meths.nvim_get_var('filename_executed'))
 
-      meths.create_autocmd('CursorHoldI', {
+      meths.nvim_create_autocmd('CursorHoldI', {
         pattern = '__init__.py',
         command = 'let g:filename_executed = expand("<afile>")',
       })
 
       -- Doesn't execute for other non-matching events
-      meths.exec_autocmds('CursorHoldI', { buffer = 1 })
-      eq('none', meths.get_var('filename_executed'))
+      meths.nvim_exec_autocmds('CursorHoldI', { buffer = 1 })
+      eq('none', meths.nvim_get_var('filename_executed'))
 
-      meths.exec_autocmds('CursorHoldI', { buffer = meths.get_current_buf() })
-      eq('__init__.py', meths.get_var('filename_executed'))
+      meths.nvim_exec_autocmds('CursorHoldI', { buffer = meths.nvim_get_current_buf() })
+      eq('__init__.py', meths.nvim_get_var('filename_executed'))
 
       -- Reset filename
-      meths.set_var('filename_executed', 'none')
+      meths.nvim_set_var('filename_executed', 'none')
 
-      meths.exec_autocmds('CursorHoldI', { pattern = '__init__.py' })
-      eq('__init__.py', meths.get_var('filename_executed'))
+      meths.nvim_exec_autocmds('CursorHoldI', { pattern = '__init__.py' })
+      eq('__init__.py', meths.nvim_get_var('filename_executed'))
     end)
 
     it('works with user autocmds', function()
-      meths.set_var('matched', 'none')
+      meths.nvim_set_var('matched', 'none')
 
-      meths.create_autocmd('User', {
+      meths.nvim_create_autocmd('User', {
         pattern = 'TestCommand',
         command = 'let g:matched = "matched"',
       })
 
-      meths.exec_autocmds('User', { pattern = 'OtherCommand' })
-      eq('none', meths.get_var('matched'))
-      meths.exec_autocmds('User', { pattern = 'TestCommand' })
-      eq('matched', meths.get_var('matched'))
+      meths.nvim_exec_autocmds('User', { pattern = 'OtherCommand' })
+      eq('none', meths.nvim_get_var('matched'))
+      meths.nvim_exec_autocmds('User', { pattern = 'TestCommand' })
+      eq('matched', meths.nvim_get_var('matched'))
     end)
 
     it('can pass group by id', function()
-      meths.set_var('group_executed', false)
+      meths.nvim_set_var('group_executed', false)
 
-      local auid = meths.create_augroup('nvim_test_augroup', { clear = true })
-      meths.create_autocmd('FileType', {
+      local auid = meths.nvim_create_augroup('nvim_test_augroup', { clear = true })
+      meths.nvim_create_autocmd('FileType', {
         group = auid,
         command = 'let g:group_executed = v:true',
       })
 
-      eq(false, meths.get_var('group_executed'))
-      meths.exec_autocmds('FileType', { group = auid })
-      eq(true, meths.get_var('group_executed'))
+      eq(false, meths.nvim_get_var('group_executed'))
+      meths.nvim_exec_autocmds('FileType', { group = auid })
+      eq(true, meths.nvim_get_var('group_executed'))
     end)
 
     it('can pass group by name', function()
-      meths.set_var('group_executed', false)
+      meths.nvim_set_var('group_executed', false)
 
       local auname = 'nvim_test_augroup'
-      meths.create_augroup(auname, { clear = true })
-      meths.create_autocmd('FileType', {
+      meths.nvim_create_augroup(auname, { clear = true })
+      meths.nvim_create_autocmd('FileType', {
         group = auname,
         command = 'let g:group_executed = v:true',
       })
 
-      eq(false, meths.get_var('group_executed'))
-      meths.exec_autocmds('FileType', { group = auname })
-      eq(true, meths.get_var('group_executed'))
+      eq(false, meths.nvim_get_var('group_executed'))
+      meths.nvim_exec_autocmds('FileType', { group = auname })
+      eq(true, meths.nvim_get_var('group_executed'))
     end)
   end)
 
@@ -1026,7 +1026,7 @@ describe('autocmd api', function()
     before_each(function()
       clear()
 
-      meths.set_var('executed', 0)
+      meths.nvim_set_var('executed', 0)
     end)
 
     local make_counting_autocmd = function(opts)
@@ -1040,7 +1040,7 @@ describe('autocmd api', function()
       resulting.group = opts.group
       resulting.once = opts.once
 
-      meths.create_autocmd('FileType', resulting)
+      meths.nvim_create_autocmd('FileType', resulting)
     end
 
     local set_ft = function(ft)
@@ -1049,12 +1049,12 @@ describe('autocmd api', function()
     end
 
     local get_executed_count = function()
-      return meths.get_var('executed')
+      return meths.nvim_get_var('executed')
     end
 
     it('can be added in a group', function()
       local augroup = 'TestGroup'
-      meths.create_augroup(augroup, { clear = true })
+      meths.nvim_create_augroup(augroup, { clear = true })
       make_counting_autocmd { group = augroup }
 
       set_ft('txt')
@@ -1083,7 +1083,7 @@ describe('autocmd api', function()
     end)
 
     it('errors on unexpected keys', function()
-      local success, code = pcall(meths.create_autocmd, 'FileType', {
+      local success, code = pcall(meths.nvim_create_autocmd, 'FileType', {
         pattern = '*',
         not_a_valid_key = 'NotDefined',
       })
@@ -1190,8 +1190,8 @@ describe('autocmd api', function()
 
     it('groups can be cleared', function()
       local augroup = 'TestGroup'
-      meths.create_augroup(augroup, { clear = true })
-      meths.create_autocmd('FileType', {
+      meths.nvim_create_augroup(augroup, { clear = true })
+      meths.nvim_create_autocmd('FileType', {
         group = augroup,
         command = 'let g:executed = g:executed + 1',
       })
@@ -1200,8 +1200,8 @@ describe('autocmd api', function()
       set_ft('txt')
       eq(2, get_executed_count(), 'should only count twice')
 
-      meths.create_augroup(augroup, { clear = true })
-      eq({}, meths.get_autocmds { group = augroup })
+      meths.nvim_create_augroup(augroup, { clear = true })
+      eq({}, meths.nvim_get_autocmds { group = augroup })
 
       set_ft('txt')
       set_ft('txt')
@@ -1210,22 +1210,22 @@ describe('autocmd api', function()
 
     it('can delete non-existent groups with pcall', function()
       eq(false, exec_lua [[return pcall(vim.api.nvim_del_augroup_by_name, 'noexist')]])
-      eq('Vim:E367: No such group: "noexist"', pcall_err(meths.del_augroup_by_name, 'noexist'))
+      eq('Vim:E367: No such group: "noexist"', pcall_err(meths.nvim_del_augroup_by_name, 'noexist'))
 
       eq(false, exec_lua [[return pcall(vim.api.nvim_del_augroup_by_id, -12342)]])
-      eq('Vim:E367: No such group: "--Deleted--"', pcall_err(meths.del_augroup_by_id, -12312))
+      eq('Vim:E367: No such group: "--Deleted--"', pcall_err(meths.nvim_del_augroup_by_id, -12312))
 
       eq(false, exec_lua [[return pcall(vim.api.nvim_del_augroup_by_id, 0)]])
-      eq('Vim:E367: No such group: "[NULL]"', pcall_err(meths.del_augroup_by_id, 0))
+      eq('Vim:E367: No such group: "[NULL]"', pcall_err(meths.nvim_del_augroup_by_id, 0))
 
       eq(false, exec_lua [[return pcall(vim.api.nvim_del_augroup_by_id, 12342)]])
-      eq('Vim:E367: No such group: "[NULL]"', pcall_err(meths.del_augroup_by_id, 12312))
+      eq('Vim:E367: No such group: "[NULL]"', pcall_err(meths.nvim_del_augroup_by_id, 12312))
     end)
 
     it('groups work with once', function()
       local augroup = 'TestGroup'
 
-      meths.create_augroup(augroup, { clear = true })
+      meths.nvim_create_augroup(augroup, { clear = true })
       make_counting_autocmd { group = augroup, once = true }
 
       set_ft('txt')
@@ -1237,7 +1237,7 @@ describe('autocmd api', function()
     it('autocmds can be registered multiple times.', function()
       local augroup = 'TestGroup'
 
-      meths.create_augroup(augroup, { clear = true })
+      meths.nvim_create_augroup(augroup, { clear = true })
       make_counting_autocmd { group = augroup, once = false }
       make_counting_autocmd { group = augroup, once = false }
       make_counting_autocmd { group = augroup, once = false }
@@ -1251,16 +1251,16 @@ describe('autocmd api', function()
     it('can be deleted', function()
       local augroup = 'WillBeDeleted'
 
-      meths.create_augroup(augroup, { clear = true })
-      meths.create_autocmd({ 'FileType' }, {
+      meths.nvim_create_augroup(augroup, { clear = true })
+      meths.nvim_create_autocmd({ 'FileType' }, {
         pattern = '*',
         command = "echo 'does not matter'",
       })
 
       -- Clears the augroup from before, which erases the autocmd
-      meths.create_augroup(augroup, { clear = true })
+      meths.nvim_create_augroup(augroup, { clear = true })
 
-      local result = #meths.get_autocmds { group = augroup }
+      local result = #meths.nvim_get_autocmds { group = augroup }
 
       eq(0, result)
     end)
@@ -1268,10 +1268,10 @@ describe('autocmd api', function()
     it('can be used for buffer local autocmds', function()
       local augroup = 'WillBeDeleted'
 
-      meths.set_var('value_set', false)
+      meths.nvim_set_var('value_set', false)
 
-      meths.create_augroup(augroup, { clear = true })
-      meths.create_autocmd('FileType', {
+      meths.nvim_create_augroup(augroup, { clear = true })
+      meths.nvim_create_autocmd('FileType', {
         pattern = '<buffer>',
         command = 'let g:value_set = v:true',
       })
@@ -1279,7 +1279,7 @@ describe('autocmd api', function()
       command 'new'
       command 'set filetype=python'
 
-      eq(false, meths.get_var('value_set'))
+      eq(false, meths.nvim_get_var('value_set'))
     end)
 
     it('can accept vimscript functions', function()
@@ -1302,7 +1302,7 @@ describe('autocmd api', function()
         set filetype=txt
       ]]
 
-      eq(2, meths.get_var('vimscript_executed'))
+      eq(2, meths.nvim_get_var('vimscript_executed'))
     end)
   end)
 
@@ -1314,11 +1314,11 @@ describe('autocmd api', function()
 
       command('augroup! TEMP_A')
 
-      eq(false, pcall(meths.get_autocmds, { group = 'TEMP_A' }))
+      eq(false, pcall(meths.nvim_get_autocmds, { group = 'TEMP_A' }))
 
       -- For some reason, augroup! doesn't clear the autocmds themselves, which is just wild
       -- but we managed to keep this behavior.
-      eq(1, #meths.get_autocmds { event = 'BufReadPost' })
+      eq(1, #meths.nvim_get_autocmds { event = 'BufReadPost' })
     end)
 
     it('legacy: remove augroups that have no autocmds', function()
@@ -1327,8 +1327,8 @@ describe('autocmd api', function()
 
       command('augroup! TEMP_AB')
 
-      eq(false, pcall(meths.get_autocmds, { group = 'TEMP_AB' }))
-      eq(0, #meths.get_autocmds { event = 'BufReadPost' })
+      eq(false, pcall(meths.nvim_get_autocmds, { group = 'TEMP_AB' }))
+      eq(0, #meths.nvim_get_autocmds { event = 'BufReadPost' })
     end)
 
     it('legacy: multiple remove and add augroup', function()
@@ -1340,7 +1340,7 @@ describe('autocmd api', function()
       command('augroup! TEMP_ABC')
 
       -- Should still have one autocmd :'(
-      local aus = meths.get_autocmds { event = 'BufReadPost' }
+      local aus = meths.nvim_get_autocmds { event = 'BufReadPost' }
       eq(1, #aus, aus)
 
       command('augroup TEMP_ABC')
@@ -1349,13 +1349,13 @@ describe('autocmd api', function()
       command('augroup END')
 
       -- Should now have two autocmds :'(
-      aus = meths.get_autocmds { event = 'BufReadPost' }
+      aus = meths.nvim_get_autocmds { event = 'BufReadPost' }
       eq(2, #aus, aus)
 
       command('augroup! TEMP_ABC')
 
-      eq(false, pcall(meths.get_autocmds, { group = 'TEMP_ABC' }))
-      eq(2, #meths.get_autocmds { event = 'BufReadPost' })
+      eq(false, pcall(meths.nvim_get_autocmds, { group = 'TEMP_ABC' }))
+      eq(2, #meths.nvim_get_autocmds { event = 'BufReadPost' })
     end)
 
     it('api: should clear and not return any autocmds for delete groups by id', function()
@@ -1363,13 +1363,13 @@ describe('autocmd api', function()
       command('autocmd! BufReadPost *.py :echo "Hello"')
       command('augroup END')
 
-      local augroup_id = meths.create_augroup('TEMP_ABCD', { clear = false })
-      meths.del_augroup_by_id(augroup_id)
+      local augroup_id = meths.nvim_create_augroup('TEMP_ABCD', { clear = false })
+      meths.nvim_del_augroup_by_id(augroup_id)
 
       -- For good reason, we kill all the autocmds from del_augroup,
       -- so now this works as expected
-      eq(false, pcall(meths.get_autocmds, { group = 'TEMP_ABCD' }))
-      eq(0, #meths.get_autocmds { event = 'BufReadPost' })
+      eq(false, pcall(meths.nvim_get_autocmds, { group = 'TEMP_ABCD' }))
+      eq(0, #meths.nvim_get_autocmds { event = 'BufReadPost' })
     end)
 
     it('api: should clear and not return any autocmds for delete groups by name', function()
@@ -1377,12 +1377,12 @@ describe('autocmd api', function()
       command('autocmd! BufReadPost *.py :echo "Hello"')
       command('augroup END')
 
-      meths.del_augroup_by_name('TEMP_ABCDE')
+      meths.nvim_del_augroup_by_name('TEMP_ABCDE')
 
       -- For good reason, we kill all the autocmds from del_augroup,
       -- so now this works as expected
-      eq(false, pcall(meths.get_autocmds, { group = 'TEMP_ABCDE' }))
-      eq(0, #meths.get_autocmds { event = 'BufReadPost' })
+      eq(false, pcall(meths.nvim_get_autocmds, { group = 'TEMP_ABCDE' }))
+      eq(0, #meths.nvim_get_autocmds { event = 'BufReadPost' })
     end)
   end)
 
@@ -1390,18 +1390,18 @@ describe('autocmd api', function()
     it('validation', function()
       eq(
         "Cannot use both 'pattern' and 'buffer'",
-        pcall_err(meths.clear_autocmds, {
+        pcall_err(meths.nvim_clear_autocmds, {
           pattern = '*',
           buffer = 42,
         })
       )
       eq(
         "Invalid 'event' item: expected String, got Array",
-        pcall_err(meths.clear_autocmds, {
+        pcall_err(meths.nvim_clear_autocmds, {
           event = { 'FileType', {} },
         })
       )
-      eq("Invalid 'group': 0", pcall_err(meths.clear_autocmds, { group = 0 }))
+      eq("Invalid 'group': 0", pcall_err(meths.nvim_clear_autocmds, { group = 0 }))
     end)
 
     it('should clear based on event + pattern', function()
@@ -1409,17 +1409,17 @@ describe('autocmd api', function()
       command('autocmd InsertEnter *.txt :echo "Text Files Are Cool"')
 
       local search = { event = 'InsertEnter', pattern = '*.txt' }
-      local before_delete = meths.get_autocmds(search)
+      local before_delete = meths.nvim_get_autocmds(search)
       eq(1, #before_delete)
 
-      local before_delete_all = meths.get_autocmds { event = search.event }
+      local before_delete_all = meths.nvim_get_autocmds { event = search.event }
       eq(2, #before_delete_all)
 
-      meths.clear_autocmds(search)
-      local after_delete = meths.get_autocmds(search)
+      meths.nvim_clear_autocmds(search)
+      local after_delete = meths.nvim_get_autocmds(search)
       eq(0, #after_delete)
 
-      local after_delete_all = meths.get_autocmds { event = search.event }
+      local after_delete_all = meths.nvim_get_autocmds { event = search.event }
       eq(1, #after_delete_all)
     end)
 
@@ -1428,11 +1428,11 @@ describe('autocmd api', function()
       command('autocmd InsertEnter *.txt :echo "Text Files Are Cool"')
 
       local search = { event = 'InsertEnter' }
-      local before_delete = meths.get_autocmds(search)
+      local before_delete = meths.nvim_get_autocmds(search)
       eq(2, #before_delete)
 
-      meths.clear_autocmds(search)
-      local after_delete = meths.get_autocmds(search)
+      meths.nvim_clear_autocmds(search)
+      local after_delete = meths.nvim_get_autocmds(search)
       eq(0, #after_delete)
     end)
 
@@ -1443,16 +1443,18 @@ describe('autocmd api', function()
       command('autocmd InsertLeave *.TestPat2 :echo "Leave 2"')
 
       local search = { pattern = '*.TestPat1' }
-      local before_delete = meths.get_autocmds(search)
+      local before_delete = meths.nvim_get_autocmds(search)
       eq(2, #before_delete)
-      local before_delete_events = meths.get_autocmds { event = { 'InsertEnter', 'InsertLeave' } }
+      local before_delete_events =
+        meths.nvim_get_autocmds { event = { 'InsertEnter', 'InsertLeave' } }
       eq(4, #before_delete_events)
 
-      meths.clear_autocmds(search)
-      local after_delete = meths.get_autocmds(search)
+      meths.nvim_clear_autocmds(search)
+      local after_delete = meths.nvim_get_autocmds(search)
       eq(0, #after_delete)
 
-      local after_delete_events = meths.get_autocmds { event = { 'InsertEnter', 'InsertLeave' } }
+      local after_delete_events =
+        meths.nvim_get_autocmds { event = { 'InsertEnter', 'InsertLeave' } }
       eq(2, #after_delete_events)
     end)
 
@@ -1462,11 +1464,11 @@ describe('autocmd api', function()
       command('autocmd InsertEnter *.TestPat1 :echo "Enter Pattern"')
 
       local search = { event = 'InsertEnter' }
-      local before_delete = meths.get_autocmds(search)
+      local before_delete = meths.nvim_get_autocmds(search)
       eq(2, #before_delete)
 
-      meths.clear_autocmds { buffer = 0 }
-      local after_delete = meths.get_autocmds(search)
+      meths.nvim_clear_autocmds { buffer = 0 }
+      local after_delete = meths.nvim_get_autocmds(search)
       eq(1, #after_delete)
       eq('*.TestPat1', after_delete[1].pattern)
     end)
@@ -1479,17 +1481,17 @@ describe('autocmd api', function()
       command('augroup END')
 
       local search = { event = 'InsertEnter', group = 'TestNvimClearAutocmds' }
-      local before_delete = meths.get_autocmds(search)
+      local before_delete = meths.nvim_get_autocmds(search)
       eq(2, #before_delete)
 
       -- Doesn't clear without passing group.
-      meths.clear_autocmds { buffer = 0 }
-      local without_group = meths.get_autocmds(search)
+      meths.nvim_clear_autocmds { buffer = 0 }
+      local without_group = meths.nvim_get_autocmds(search)
       eq(2, #without_group)
 
       -- Doesn't clear with passing group.
-      meths.clear_autocmds { buffer = 0, group = search.group }
-      local with_group = meths.get_autocmds(search)
+      meths.nvim_clear_autocmds { buffer = 0, group = search.group }
+      local with_group = meths.nvim_get_autocmds(search)
       eq(1, #with_group)
     end)
   end)
diff --git a/test/functional/api/buffer_spec.lua b/test/functional/api/buffer_spec.lua
index 0dd01b7299..c71853b574 100644
--- a/test/functional/api/buffer_spec.lua
+++ b/test/functional/api/buffer_spec.lua
@@ -42,9 +42,9 @@ describe('api/buf', function()
     end)
 
     it("doesn't crash just after set undolevels=1 #24894", function()
-      local buf = meths.create_buf(false, true)
-      meths.buf_set_option(buf, 'undolevels', -1)
-      meths.buf_set_lines(buf, 0, 1, false, {})
+      local buf = meths.nvim_create_buf(false, true)
+      meths.nvim_buf_set_option(buf, 'undolevels', -1)
+      meths.nvim_buf_set_lines(buf, 0, 1, false, {})
 
       assert_alive()
     end)
@@ -85,35 +85,41 @@ describe('api/buf', function()
     end)
 
     it('cursor position is maintained in non-current window', function()
-      meths.buf_set_lines(0, 0, -1, 1, { 'line1', 'line2', 'line3', 'line4' })
-      meths.win_set_cursor(0, { 3, 2 })
-      local win = meths.get_current_win()
-      local buf = meths.get_current_buf()
+      meths.nvim_buf_set_lines(0, 0, -1, 1, { 'line1', 'line2', 'line3', 'line4' })
+      meths.nvim_win_set_cursor(0, { 3, 2 })
+      local win = meths.nvim_get_current_win()
+      local buf = meths.nvim_get_current_buf()
 
       command('new')
 
-      meths.buf_set_lines(buf, 1, 2, 1, { 'line5', 'line6' })
-      eq({ 'line1', 'line5', 'line6', 'line3', 'line4' }, meths.buf_get_lines(buf, 0, -1, true))
-      eq({ 4, 2 }, meths.win_get_cursor(win))
+      meths.nvim_buf_set_lines(buf, 1, 2, 1, { 'line5', 'line6' })
+      eq(
+        { 'line1', 'line5', 'line6', 'line3', 'line4' },
+        meths.nvim_buf_get_lines(buf, 0, -1, true)
+      )
+      eq({ 4, 2 }, meths.nvim_win_get_cursor(win))
     end)
 
     it('cursor position is maintained in TWO non-current windows', function()
-      meths.buf_set_lines(0, 0, -1, 1, { 'line1', 'line2', 'line3', 'line4' })
-      meths.win_set_cursor(0, { 3, 2 })
-      local win = meths.get_current_win()
-      local buf = meths.get_current_buf()
+      meths.nvim_buf_set_lines(0, 0, -1, 1, { 'line1', 'line2', 'line3', 'line4' })
+      meths.nvim_win_set_cursor(0, { 3, 2 })
+      local win = meths.nvim_get_current_win()
+      local buf = meths.nvim_get_current_buf()
 
       command('split')
-      meths.win_set_cursor(0, { 4, 2 })
-      local win2 = meths.get_current_win()
+      meths.nvim_win_set_cursor(0, { 4, 2 })
+      local win2 = meths.nvim_get_current_win()
 
       -- set current window to third one with another buffer
       command('new')
 
-      meths.buf_set_lines(buf, 1, 2, 1, { 'line5', 'line6' })
-      eq({ 'line1', 'line5', 'line6', 'line3', 'line4' }, meths.buf_get_lines(buf, 0, -1, true))
-      eq({ 4, 2 }, meths.win_get_cursor(win))
-      eq({ 5, 2 }, meths.win_get_cursor(win2))
+      meths.nvim_buf_set_lines(buf, 1, 2, 1, { 'line5', 'line6' })
+      eq(
+        { 'line1', 'line5', 'line6', 'line3', 'line4' },
+        meths.nvim_buf_get_lines(buf, 0, -1, true)
+      )
+      eq({ 4, 2 }, meths.nvim_win_get_cursor(win))
+      eq({ 5, 2 }, meths.nvim_win_get_cursor(win2))
     end)
 
     it('line_count has defined behaviour for unloaded buffers', function()
@@ -156,16 +162,22 @@ describe('api/buf', function()
           [3] = { reverse = true },
         }
         screen:attach()
-        meths.buf_set_lines(0, 0, -1, 1, { 'aaa', 'bbb', 'ccc', 'ddd', 'www', 'xxx', 'yyy', 'zzz' })
-        meths.set_option_value('modified', false, {})
+        meths.nvim_buf_set_lines(
+          0,
+          0,
+          -1,
+          1,
+          { 'aaa', 'bbb', 'ccc', 'ddd', 'www', 'xxx', 'yyy', 'zzz' }
+        )
+        meths.nvim_set_option_value('modified', false, {})
       end)
 
       it('of current window', function()
-        local win = meths.get_current_win()
-        local buf = meths.get_current_buf()
+        local win = meths.nvim_get_current_win()
+        local buf = meths.nvim_get_current_buf()
 
         command('new | wincmd w')
-        meths.win_set_cursor(win, { 8, 0 })
+        meths.nvim_win_set_cursor(win, { 8, 0 })
 
         screen:expect {
           grid = [[
@@ -181,7 +193,7 @@ describe('api/buf', function()
         ]],
         }
 
-        meths.buf_set_lines(buf, 0, 2, true, { 'aaabbb' })
+        meths.nvim_buf_set_lines(buf, 0, 2, true, { 'aaabbb' })
         screen:expect {
           grid = [[
                               |
@@ -197,7 +209,7 @@ describe('api/buf', function()
         }
 
         -- replacing topline keeps it the topline
-        meths.buf_set_lines(buf, 3, 4, true, { 'wwweeee' })
+        meths.nvim_buf_set_lines(buf, 3, 4, true, { 'wwweeee' })
         screen:expect {
           grid = [[
                               |
@@ -213,7 +225,7 @@ describe('api/buf', function()
         }
 
         -- inserting just before topline does not scroll up if cursor would be moved
-        meths.buf_set_lines(buf, 3, 3, true, { 'mmm' })
+        meths.nvim_buf_set_lines(buf, 3, 3, true, { 'mmm' })
         screen:expect {
           grid = [[
                               |
@@ -229,7 +241,7 @@ describe('api/buf', function()
           unchanged = true,
         }
 
-        meths.win_set_cursor(0, { 7, 0 })
+        meths.nvim_win_set_cursor(0, { 7, 0 })
         screen:expect {
           grid = [[
                               |
@@ -244,7 +256,7 @@ describe('api/buf', function()
         ]],
         }
 
-        meths.buf_set_lines(buf, 4, 4, true, { 'mmmeeeee' })
+        meths.nvim_buf_set_lines(buf, 4, 4, true, { 'mmmeeeee' })
         screen:expect {
           grid = [[
                               |
@@ -261,11 +273,11 @@ describe('api/buf', function()
       end)
 
       it('of non-current window', function()
-        local win = meths.get_current_win()
-        local buf = meths.get_current_buf()
+        local win = meths.nvim_get_current_win()
+        local buf = meths.nvim_get_current_buf()
 
         command('new')
-        meths.win_set_cursor(win, { 8, 0 })
+        meths.nvim_win_set_cursor(win, { 8, 0 })
 
         screen:expect {
           grid = [[
@@ -281,7 +293,7 @@ describe('api/buf', function()
         ]],
         }
 
-        meths.buf_set_lines(buf, 0, 2, true, { 'aaabbb' })
+        meths.nvim_buf_set_lines(buf, 0, 2, true, { 'aaabbb' })
         screen:expect {
           grid = [[
           ^                    |
@@ -297,7 +309,7 @@ describe('api/buf', function()
         }
 
         -- replacing topline keeps it the topline
-        meths.buf_set_lines(buf, 3, 4, true, { 'wwweeee' })
+        meths.nvim_buf_set_lines(buf, 3, 4, true, { 'wwweeee' })
         screen:expect {
           grid = [[
           ^                    |
@@ -313,7 +325,7 @@ describe('api/buf', function()
         }
 
         -- inserting just before topline scrolls up
-        meths.buf_set_lines(buf, 3, 3, true, { 'mmm' })
+        meths.nvim_buf_set_lines(buf, 3, 3, true, { 'mmm' })
         screen:expect {
           grid = [[
           ^                    |
@@ -330,12 +342,12 @@ describe('api/buf', function()
       end)
 
       it('of split windows with same buffer', function()
-        local win = meths.get_current_win()
-        local buf = meths.get_current_buf()
+        local win = meths.nvim_get_current_win()
+        local buf = meths.nvim_get_current_buf()
 
         command('split')
-        meths.win_set_cursor(win, { 8, 0 })
-        meths.win_set_cursor(0, { 1, 0 })
+        meths.nvim_win_set_cursor(win, { 8, 0 })
+        meths.nvim_win_set_cursor(0, { 1, 0 })
 
         screen:expect {
           grid = [[
@@ -353,7 +365,7 @@ describe('api/buf', function()
                               |
         ]],
         }
-        meths.buf_set_lines(buf, 0, 2, true, { 'aaabbb' })
+        meths.nvim_buf_set_lines(buf, 0, 2, true, { 'aaabbb' })
 
         screen:expect {
           grid = [[
@@ -373,7 +385,7 @@ describe('api/buf', function()
         }
 
         -- replacing topline keeps it the topline
-        meths.buf_set_lines(buf, 3, 4, true, { 'wwweeee' })
+        meths.nvim_buf_set_lines(buf, 3, 4, true, { 'wwweeee' })
         screen:expect {
           grid = [[
           ^aaabbb              |
@@ -392,7 +404,7 @@ describe('api/buf', function()
         }
 
         -- inserting just before topline scrolls up
-        meths.buf_set_lines(buf, 3, 3, true, { 'mmm' })
+        meths.nvim_buf_set_lines(buf, 3, 3, true, { 'mmm' })
         screen:expect {
           grid = [[
           ^aaabbb              |
@@ -413,15 +425,15 @@ describe('api/buf', function()
     end)
 
     it('handles clearing out non-current buffer #24911', function()
-      local buf = meths.get_current_buf()
-      meths.buf_set_lines(buf, 0, -1, true, { 'aaa', 'bbb', 'ccc' })
+      local buf = meths.nvim_get_current_buf()
+      meths.nvim_buf_set_lines(buf, 0, -1, true, { 'aaa', 'bbb', 'ccc' })
       command('new')
 
-      meths.buf_set_lines(0, 0, -1, true, { 'xxx', 'yyy', 'zzz' })
+      meths.nvim_buf_set_lines(0, 0, -1, true, { 'xxx', 'yyy', 'zzz' })
 
-      meths.buf_set_lines(buf, 0, -1, true, {})
-      eq({ 'xxx', 'yyy', 'zzz' }, meths.buf_get_lines(0, 0, -1, true))
-      eq({ '' }, meths.buf_get_lines(buf, 0, -1, true))
+      meths.nvim_buf_set_lines(buf, 0, -1, true, {})
+      eq({ 'xxx', 'yyy', 'zzz' }, meths.nvim_buf_get_lines(0, 0, -1, true))
+      eq({ '' }, meths.nvim_buf_get_lines(buf, 0, -1, true))
     end)
   end)
 
@@ -676,7 +688,7 @@ describe('api/buf', function()
         Who would win?
         A real window
         with proper text]])
-      local buf = api.meths.create_buf(false, true)
+      local buf = api.meths.nvim_create_buf(false, true)
       screen:expect([[
         Who would win?      |
         A real window       |
@@ -685,7 +697,7 @@ describe('api/buf', function()
                             |
       ]])
 
-      api.meths.buf_set_lines(buf, 0, -1, true, { 'or some', 'scratchy text' })
+      api.meths.nvim_buf_set_lines(buf, 0, -1, true, { 'or some', 'scratchy text' })
       feed('i') -- provoke redraw
       screen:expect([[
         Who would win?      |
@@ -701,22 +713,22 @@ describe('api/buf', function()
         visible buffer line 1
         line 2
       ]])
-      local hiddenbuf = api.meths.create_buf(false, true)
+      local hiddenbuf = api.meths.nvim_create_buf(false, true)
       command('vsplit')
       command('vsplit')
       feed('<c-w>l<c-w>l<c-w>l')
       eq(3, funcs.winnr())
       feed('<c-w>h')
       eq(2, funcs.winnr())
-      api.meths.buf_set_lines(hiddenbuf, 0, -1, true, { 'hidden buffer line 1', 'line 2' })
+      api.meths.nvim_buf_set_lines(hiddenbuf, 0, -1, true, { 'hidden buffer line 1', 'line 2' })
       feed('<c-w>p')
       eq(3, funcs.winnr())
     end)
 
     it('set_lines on unloaded buffer #8659 #22670', function()
       local bufnr = curbuf('get_number')
-      meths.buf_set_lines(bufnr, 0, -1, false, { 'a', 'b', 'c' })
-      meths.buf_set_name(bufnr, 'set_lines')
+      meths.nvim_buf_set_lines(bufnr, 0, -1, false, { 'a', 'b', 'c' })
+      meths.nvim_buf_set_name(bufnr, 'set_lines')
       finally(function()
         os.remove('set_lines')
       end)
@@ -724,8 +736,8 @@ describe('api/buf', function()
       command('new')
       command('bunload! ' .. bufnr)
       local new_bufnr = funcs.bufnr('set_lines', true)
-      meths.buf_set_lines(new_bufnr, 0, -1, false, {})
-      eq({ '' }, meths.buf_get_lines(new_bufnr, 0, -1, false))
+      meths.nvim_buf_set_lines(new_bufnr, 0, -1, false, {})
+      eq({ '' }, meths.nvim_buf_get_lines(new_bufnr, 0, -1, false))
     end)
   end)
 
@@ -822,18 +834,18 @@ describe('api/buf', function()
       hello world!]])
 
       -- position the cursor on `!`
-      meths.win_set_cursor(0, { 1, 11 })
+      meths.nvim_win_set_cursor(0, { 1, 11 })
 
-      local win = meths.get_current_win()
-      local buf = meths.get_current_buf()
+      local win = meths.nvim_get_current_win()
+      local buf = meths.nvim_get_current_buf()
 
       command('new')
 
       -- replace 'world' with 'foo'
-      meths.buf_set_text(buf, 0, 6, 0, 11, { 'foo' })
-      eq({ 'hello foo!' }, meths.buf_get_lines(buf, 0, -1, true))
+      meths.nvim_buf_set_text(buf, 0, 6, 0, 11, { 'foo' })
+      eq({ 'hello foo!' }, meths.nvim_buf_get_lines(buf, 0, -1, true))
       -- cursor should be moved left by two columns (replacement is shorter by 2 chars)
-      eq({ 1, 9 }, meths.win_get_cursor(win))
+      eq({ 1, 9 }, meths.nvim_win_get_cursor(win))
     end)
 
     it('updates the cursor position in TWO non-current windows', function()
@@ -841,24 +853,24 @@ describe('api/buf', function()
       hello world!]])
 
       -- position the cursor on `!`
-      meths.win_set_cursor(0, { 1, 11 })
-      local win = meths.get_current_win()
-      local buf = meths.get_current_buf()
+      meths.nvim_win_set_cursor(0, { 1, 11 })
+      local win = meths.nvim_get_current_win()
+      local buf = meths.nvim_get_current_buf()
 
       command('split')
-      local win2 = meths.get_current_win()
+      local win2 = meths.nvim_get_current_win()
       -- position the cursor on `w`
-      meths.win_set_cursor(0, { 1, 6 })
+      meths.nvim_win_set_cursor(0, { 1, 6 })
 
       command('new')
 
       -- replace 'hello' with 'foo'
-      meths.buf_set_text(buf, 0, 0, 0, 5, { 'foo' })
-      eq({ 'foo world!' }, meths.buf_get_lines(buf, 0, -1, true))
+      meths.nvim_buf_set_text(buf, 0, 0, 0, 5, { 'foo' })
+      eq({ 'foo world!' }, meths.nvim_buf_get_lines(buf, 0, -1, true))
 
       -- both cursors should be moved left by two columns (replacement is shorter by 2 chars)
-      eq({ 1, 9 }, meths.win_get_cursor(win))
-      eq({ 1, 4 }, meths.win_get_cursor(win2))
+      eq({ 1, 9 }, meths.nvim_win_get_cursor(win))
+      eq({ 1, 4 }, meths.nvim_win_get_cursor(win2))
     end)
 
     describe('when text is being added right at cursor position #22526', function()
@@ -1693,7 +1705,7 @@ describe('api/buf', function()
     it('no heap-use-after-free when called consecutively #19643', function()
       set_text(0, 0, 0, 0, { 'one', '', '', 'two' })
       eq({ 'one', '', '', 'two' }, get_lines(0, 4, true))
-      meths.win_set_cursor(0, { 1, 0 })
+      meths.nvim_win_set_cursor(0, { 1, 0 })
       exec_lua([[
         vim.api.nvim_buf_set_text(0, 0, 3, 1, 0, {''})
         vim.api.nvim_buf_set_text(0, 0, 3, 1, 0, {''})
@@ -1711,16 +1723,22 @@ describe('api/buf', function()
           [3] = { reverse = true },
         }
         screen:attach()
-        meths.buf_set_lines(0, 0, -1, 1, { 'aaa', 'bbb', 'ccc', 'ddd', 'www', 'xxx', 'yyy', 'zzz' })
-        meths.set_option_value('modified', false, {})
+        meths.nvim_buf_set_lines(
+          0,
+          0,
+          -1,
+          1,
+          { 'aaa', 'bbb', 'ccc', 'ddd', 'www', 'xxx', 'yyy', 'zzz' }
+        )
+        meths.nvim_set_option_value('modified', false, {})
       end)
 
       it('of current window', function()
-        local win = meths.get_current_win()
-        local buf = meths.get_current_buf()
+        local win = meths.nvim_get_current_win()
+        local buf = meths.nvim_get_current_buf()
 
         command('new | wincmd w')
-        meths.win_set_cursor(win, { 8, 0 })
+        meths.nvim_win_set_cursor(win, { 8, 0 })
 
         screen:expect {
           grid = [[
@@ -1735,7 +1753,7 @@ describe('api/buf', function()
                               |
         ]],
         }
-        meths.buf_set_text(buf, 0, 3, 1, 0, { 'X' })
+        meths.nvim_buf_set_text(buf, 0, 3, 1, 0, { 'X' })
 
         screen:expect {
           grid = [[
@@ -1753,11 +1771,11 @@ describe('api/buf', function()
       end)
 
       it('of non-current window', function()
-        local win = meths.get_current_win()
-        local buf = meths.get_current_buf()
+        local win = meths.nvim_get_current_win()
+        local buf = meths.nvim_get_current_buf()
 
         command('new')
-        meths.win_set_cursor(win, { 8, 0 })
+        meths.nvim_win_set_cursor(win, { 8, 0 })
 
         screen:expect {
           grid = [[
@@ -1773,7 +1791,7 @@ describe('api/buf', function()
         ]],
         }
 
-        meths.buf_set_text(buf, 0, 3, 1, 0, { 'X' })
+        meths.nvim_buf_set_text(buf, 0, 3, 1, 0, { 'X' })
         screen:expect {
           grid = [[
           ^                    |
@@ -1790,12 +1808,12 @@ describe('api/buf', function()
       end)
 
       it('of split windows with same buffer', function()
-        local win = meths.get_current_win()
-        local buf = meths.get_current_buf()
+        local win = meths.nvim_get_current_win()
+        local buf = meths.nvim_get_current_buf()
 
         command('split')
-        meths.win_set_cursor(win, { 8, 0 })
-        meths.win_set_cursor(0, { 1, 1 })
+        meths.nvim_win_set_cursor(win, { 8, 0 })
+        meths.nvim_win_set_cursor(0, { 1, 1 })
 
         screen:expect {
           grid = [[
@@ -1813,7 +1831,7 @@ describe('api/buf', function()
                               |
         ]],
         }
-        meths.buf_set_text(buf, 0, 3, 1, 0, { 'X' })
+        meths.nvim_buf_set_text(buf, 0, 3, 1, 0, { 'X' })
 
         screen:expect {
           grid = [[
@@ -1861,7 +1879,7 @@ describe('api/buf', function()
       eq('Index out of bounds', pcall_err(get_text, 0, 0, 3, 0, {}))
       eq('Index out of bounds', pcall_err(get_text, 0, 0, -4, 0, {}))
       -- no ml_get errors should happen #19017
-      eq('', meths.get_vvar('errmsg'))
+      eq('', meths.nvim_get_vvar('errmsg'))
     end)
 
     it('errors when start is greater than end', function()
@@ -1884,19 +1902,19 @@ describe('api/buf', function()
       eq('Index out of bounds', pcall_err(get_offset, 6))
       eq('Index out of bounds', pcall_err(get_offset, -1))
 
-      meths.set_option_value('eol', false, {})
-      meths.set_option_value('fixeol', false, {})
+      meths.nvim_set_option_value('eol', false, {})
+      meths.nvim_set_option_value('fixeol', false, {})
       eq(28, get_offset(5))
 
       -- fileformat is ignored
-      meths.set_option_value('fileformat', 'dos', {})
+      meths.nvim_set_option_value('fileformat', 'dos', {})
       eq(0, get_offset(0))
       eq(6, get_offset(1))
       eq(15, get_offset(2))
       eq(16, get_offset(3))
       eq(24, get_offset(4))
       eq(28, get_offset(5))
-      meths.set_option_value('eol', true, {})
+      meths.nvim_set_option_value('eol', true, {})
       eq(29, get_offset(5))
 
       command('set hidden')
@@ -2077,7 +2095,7 @@ describe('api/buf', function()
       eq(false, pcall(curbufmeths.set_mark, 'fail', 1, 0, {}))
     end)
     it('fails when invalid buffer number is used', function()
-      eq(false, pcall(meths.buf_set_mark, 99, 'a', 1, 1, {}))
+      eq(false, pcall(meths.nvim_buf_set_mark, 99, 'a', 1, 1, {}))
     end)
   end)
 
@@ -2095,7 +2113,7 @@ describe('api/buf', function()
       eq({ 0, 0 }, curbufmeths.get_mark('Z'))
     end)
     it('returns false in marks not set in this buffer', function()
-      local abuf = meths.create_buf(false, true)
+      local abuf = meths.nvim_create_buf(false, true)
       bufmeths.set_lines(abuf, -1, -1, true, { 'a', 'bit of', 'text' })
       bufmeths.set_mark(abuf, 'A', 2, 2, {})
       eq(false, curbufmeths.del_mark('A'))
@@ -2112,7 +2130,7 @@ describe('api/buf', function()
       eq(false, pcall(curbufmeths.del_mark, 'fail'))
     end)
     it('fails when invalid buffer number is used', function()
-      eq(false, pcall(meths.buf_del_mark, 99, 'a'))
+      eq(false, pcall(meths.nvim_buf_del_mark, 99, 'a'))
     end)
   end)
 end)
diff --git a/test/functional/api/command_spec.lua b/test/functional/api/command_spec.lua
index 6486b58db9..f1e3c5155d 100644
--- a/test/functional/api/command_spec.lua
+++ b/test/functional/api/command_spec.lua
@@ -51,24 +51,24 @@ describe('nvim_get_commands', function()
   before_each(clear)
 
   it('gets empty list if no commands were defined', function()
-    eq({}, meths.get_commands({ builtin = false }))
+    eq({}, meths.nvim_get_commands({ builtin = false }))
   end)
 
   it('validation', function()
-    eq('builtin=true not implemented', pcall_err(meths.get_commands, { builtin = true }))
-    eq("Invalid key: 'foo'", pcall_err(meths.get_commands, { foo = 'blah' }))
+    eq('builtin=true not implemented', pcall_err(meths.nvim_get_commands, { builtin = true }))
+    eq("Invalid key: 'foo'", pcall_err(meths.nvim_get_commands, { foo = 'blah' }))
   end)
 
   it('gets global user-defined commands', function()
     -- Define a command.
     command('command -nargs=1 Hello echo "Hello World"')
-    eq({ Hello = cmd_dict }, meths.get_commands({ builtin = false }))
+    eq({ Hello = cmd_dict }, meths.nvim_get_commands({ builtin = false }))
     -- Define another command.
     command('command -nargs=? Pwd pwd')
-    eq({ Hello = cmd_dict, Pwd = cmd_dict2 }, meths.get_commands({ builtin = false }))
+    eq({ Hello = cmd_dict, Pwd = cmd_dict2 }, meths.nvim_get_commands({ builtin = false }))
     -- Delete a command.
     command('delcommand Pwd')
-    eq({ Hello = cmd_dict }, meths.get_commands({ builtin = false }))
+    eq({ Hello = cmd_dict }, meths.nvim_get_commands({ builtin = false }))
   end)
 
   it('gets buffer-local user-defined commands', function()
@@ -171,9 +171,9 @@ describe('nvim_get_commands', function()
       let s:foo = 1
       command -complete=custom,ListUsers -nargs=+ Finger !finger <args>
     ]])
-    eq({ Finger = cmd1 }, meths.get_commands({ builtin = false }))
+    eq({ Finger = cmd1 }, meths.nvim_get_commands({ builtin = false }))
     command('command -nargs=1 -complete=dir -addr=arguments -count=10 TestCmd pwd <args>')
-    eq({ Finger = cmd1, TestCmd = cmd0 }, meths.get_commands({ builtin = false }))
+    eq({ Finger = cmd1, TestCmd = cmd0 }, meths.nvim_get_commands({ builtin = false }))
 
     source([[
       function! s:foo() abort
@@ -193,7 +193,7 @@ describe('nvim_get_commands', function()
     -- TODO(justinmk): Order is stable but undefined. Sort before return?
     eq(
       { Cmd2 = cmd2, Cmd3 = cmd3, Cmd4 = cmd4, Finger = cmd1, TestCmd = cmd0 },
-      meths.get_commands({ builtin = false })
+      meths.nvim_get_commands({ builtin = false })
     )
   end)
 end)
@@ -202,9 +202,9 @@ describe('nvim_create_user_command', function()
   before_each(clear)
 
   it('works with strings', function()
-    meths.create_user_command('SomeCommand', 'let g:command_fired = <args>', { nargs = 1 })
-    meths.command('SomeCommand 42')
-    eq(42, meths.eval('g:command_fired'))
+    meths.nvim_create_user_command('SomeCommand', 'let g:command_fired = <args>', { nargs = 1 })
+    meths.nvim_command('SomeCommand 42')
+    eq(42, meths.nvim_eval('g:command_fired'))
   end)
 
   it('works with Lua functions', function()
@@ -646,11 +646,11 @@ describe('nvim_create_user_command', function()
   end)
 
   it('can define buffer-local commands', function()
-    local bufnr = meths.create_buf(false, false)
+    local bufnr = meths.nvim_create_buf(false, false)
     bufmeths.create_user_command(bufnr, 'Hello', '', {})
-    matches('Not an editor command: Hello', pcall_err(meths.command, 'Hello'))
-    meths.set_current_buf(bufnr)
-    meths.command('Hello')
+    matches('Not an editor command: Hello', pcall_err(meths.nvim_command, 'Hello'))
+    meths.nvim_set_current_buf(bufnr)
+    meths.nvim_command('Hello')
     assert_alive()
   end)
 
@@ -731,28 +731,28 @@ describe('nvim_create_user_command', function()
         vim.api.nvim_cmd({ cmd = 'echo', args = { '&verbose' }, mods = opts.smods }, {})
       end, {})
     ]]
-    eq('3', meths.cmd({ cmd = 'MyEcho', mods = { verbose = 3 } }, { output = true }))
+    eq('3', meths.nvim_cmd({ cmd = 'MyEcho', mods = { verbose = 3 } }, { output = true }))
 
-    eq(1, #meths.list_tabpages())
+    eq(1, #meths.nvim_list_tabpages())
     exec_lua [[
       vim.api.nvim_create_user_command('MySplit', function(opts)
         vim.api.nvim_cmd({ cmd = 'split', mods = opts.smods }, {})
       end, {})
     ]]
-    meths.cmd({ cmd = 'MySplit' }, {})
-    eq(1, #meths.list_tabpages())
-    eq(2, #meths.list_wins())
-    meths.cmd({ cmd = 'MySplit', mods = { tab = 1 } }, {})
-    eq(2, #meths.list_tabpages())
+    meths.nvim_cmd({ cmd = 'MySplit' }, {})
+    eq(1, #meths.nvim_list_tabpages())
+    eq(2, #meths.nvim_list_wins())
+    meths.nvim_cmd({ cmd = 'MySplit', mods = { tab = 1 } }, {})
+    eq(2, #meths.nvim_list_tabpages())
     eq(2, funcs.tabpagenr())
-    meths.cmd({ cmd = 'MySplit', mods = { tab = 1 } }, {})
-    eq(3, #meths.list_tabpages())
+    meths.nvim_cmd({ cmd = 'MySplit', mods = { tab = 1 } }, {})
+    eq(3, #meths.nvim_list_tabpages())
     eq(2, funcs.tabpagenr())
-    meths.cmd({ cmd = 'MySplit', mods = { tab = 3 } }, {})
-    eq(4, #meths.list_tabpages())
+    meths.nvim_cmd({ cmd = 'MySplit', mods = { tab = 3 } }, {})
+    eq(4, #meths.nvim_list_tabpages())
     eq(4, funcs.tabpagenr())
-    meths.cmd({ cmd = 'MySplit', mods = { tab = 0 } }, {})
-    eq(5, #meths.list_tabpages())
+    meths.nvim_cmd({ cmd = 'MySplit', mods = { tab = 0 } }, {})
+    eq(5, #meths.nvim_list_tabpages())
     eq(1, funcs.tabpagenr())
   end)
 end)
@@ -761,16 +761,16 @@ describe('nvim_del_user_command', function()
   before_each(clear)
 
   it('can delete global commands', function()
-    meths.create_user_command('Hello', 'echo "Hi"', {})
-    meths.command('Hello')
-    meths.del_user_command('Hello')
-    matches('Not an editor command: Hello', pcall_err(meths.command, 'Hello'))
+    meths.nvim_create_user_command('Hello', 'echo "Hi"', {})
+    meths.nvim_command('Hello')
+    meths.nvim_del_user_command('Hello')
+    matches('Not an editor command: Hello', pcall_err(meths.nvim_command, 'Hello'))
   end)
 
   it('can delete buffer-local commands', function()
     bufmeths.create_user_command(0, 'Hello', 'echo "Hi"', {})
-    meths.command('Hello')
+    meths.nvim_command('Hello')
     bufmeths.del_user_command(0, 'Hello')
-    matches('Not an editor command: Hello', pcall_err(meths.command, 'Hello'))
+    matches('Not an editor command: Hello', pcall_err(meths.nvim_command, 'Hello'))
   end)
 end)
diff --git a/test/functional/api/extmark_spec.lua b/test/functional/api/extmark_spec.lua
index 0594f36d0e..83fc5aa47f 100644
--- a/test/functional/api/extmark_spec.lua
+++ b/test/functional/api/extmark_spec.lua
@@ -1472,7 +1472,7 @@ describe('API/extmarks', function()
 
   it('in read-only buffer', function()
     command('view! runtime/doc/help.txt')
-    eq(true, meths.get_option_value('ro', {}))
+    eq(true, meths.nvim_get_option_value('ro', {}))
     local id = set_extmark(ns, 0, 0, 2)
     eq({ { id, 0, 2 } }, get_extmarks(ns, 0, -1))
   end)
@@ -1512,7 +1512,7 @@ describe('API/extmarks', function()
     curbufmeths.set_text(0, 0, 0, 17, {})
 
     -- handles set_text correctly as well
-    eq({ { 1, 0, 0 }, { 2, 0, 0 } }, meths.buf_get_extmarks(0, ns, 0, -1, {}))
+    eq({ { 1, 0, 0 }, { 2, 0, 0 } }, meths.nvim_buf_get_extmarks(0, ns, 0, -1, {}))
     curbufmeths.set_text(0, 0, 0, 0, { 'asdfasdf' })
     eq({ { 1, 0, 0 }, { 2, 0, 8 } }, curbufmeths.get_extmarks(ns, 0, -1, {}))
 
@@ -1520,7 +1520,7 @@ describe('API/extmarks', function()
     -- handles pasting
     exec([[let @a='asdfasdf']])
     feed([["ap]])
-    eq({ { 1, 0, 0 }, { 2, 0, 8 } }, meths.buf_get_extmarks(0, ns, 0, -1, {}))
+    eq({ { 1, 0, 0 }, { 2, 0, 8 } }, meths.nvim_buf_get_extmarks(0, ns, 0, -1, {}))
   end)
 
   it('can accept "end_row" or "end_line" #16548', function()
@@ -1547,7 +1547,7 @@ describe('API/extmarks', function()
   it('in prompt buffer', function()
     feed('dd')
     local id = set_extmark(ns, marks[1], 0, 0, {})
-    meths.set_option_value('buftype', 'prompt', {})
+    meths.nvim_set_option_value('buftype', 'prompt', {})
     feed('i<esc>')
     eq({ { id, 0, 2 } }, get_extmarks(ns, 0, -1))
   end)
@@ -1695,7 +1695,7 @@ describe('API/extmarks', function()
     screen = Screen.new(40, 6)
     screen:attach()
     feed('dd6iaaa bbb ccc<CR><ESC>gg')
-    meths.set_option_value('signcolumn', 'auto:2', {})
+    meths.nvim_set_option_value('signcolumn', 'auto:2', {})
     set_extmark(ns, 1, 0, 0, { invalidate = true, sign_text = 'S1', end_row = 1 })
     set_extmark(ns, 2, 1, 0, { invalidate = true, sign_text = 'S2', end_row = 2 })
     -- mark with invalidate is removed
diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua
index fe9e2a7727..07ce9d0c54 100644
--- a/test/functional/api/highlight_spec.lua
+++ b/test/functional/api/highlight_spec.lua
@@ -59,7 +59,7 @@ describe('API: highlight', function()
     eq(expected_rgb, nvim('get_hl_by_id', hl_id, true))
 
     -- Test invalid id.
-    eq('Invalid highlight id: 30000', pcall_err(meths.get_hl_by_id, 30000, false))
+    eq('Invalid highlight id: 30000', pcall_err(meths.nvim_get_hl_by_id, 30000, false))
 
     -- Test all highlight properties.
     command('hi NewHighlight gui=underline,bold,italic,reverse,strikethrough,altfont,nocombine')
@@ -72,30 +72,30 @@ describe('API: highlight', function()
     -- Test nil argument.
     eq(
       'Wrong type for argument 1 when calling nvim_get_hl_by_id, expecting Integer',
-      pcall_err(meths.get_hl_by_id, { nil }, false)
+      pcall_err(meths.nvim_get_hl_by_id, { nil }, false)
     )
 
     -- Test 0 argument.
-    eq('Invalid highlight id: 0', pcall_err(meths.get_hl_by_id, 0, false))
+    eq('Invalid highlight id: 0', pcall_err(meths.nvim_get_hl_by_id, 0, false))
 
     -- Test -1 argument.
-    eq('Invalid highlight id: -1', pcall_err(meths.get_hl_by_id, -1, false))
+    eq('Invalid highlight id: -1', pcall_err(meths.nvim_get_hl_by_id, -1, false))
 
     -- Test highlight group without ctermbg value.
     command('hi Normal ctermfg=red ctermbg=yellow')
     command('hi NewConstant ctermfg=green guifg=white guibg=blue')
     hl_id = eval("hlID('NewConstant')")
-    eq({ foreground = 10 }, meths.get_hl_by_id(hl_id, false))
+    eq({ foreground = 10 }, meths.nvim_get_hl_by_id(hl_id, false))
 
     -- Test highlight group without ctermfg value.
     command('hi clear NewConstant')
     command('hi NewConstant ctermbg=Magenta guifg=white guibg=blue')
-    eq({ background = 13 }, meths.get_hl_by_id(hl_id, false))
+    eq({ background = 13 }, meths.nvim_get_hl_by_id(hl_id, false))
 
     -- Test highlight group with ctermfg and ctermbg values.
     command('hi clear NewConstant')
     command('hi NewConstant ctermfg=green ctermbg=Magenta guifg=white guibg=blue')
-    eq({ foreground = 10, background = 13 }, meths.get_hl_by_id(hl_id, false))
+    eq({ foreground = 10, background = 13 }, meths.nvim_get_hl_by_id(hl_id, false))
   end)
 
   it('nvim_get_hl_by_name', function()
@@ -114,28 +114,28 @@ describe('API: highlight', function()
     -- Test invalid name.
     eq(
       "Invalid highlight name: 'unknown_highlight'",
-      pcall_err(meths.get_hl_by_name, 'unknown_highlight', false)
+      pcall_err(meths.nvim_get_hl_by_name, 'unknown_highlight', false)
     )
 
     -- Test nil argument.
     eq(
       'Wrong type for argument 1 when calling nvim_get_hl_by_name, expecting String',
-      pcall_err(meths.get_hl_by_name, { nil }, false)
+      pcall_err(meths.nvim_get_hl_by_name, { nil }, false)
     )
 
     -- Test empty string argument.
-    eq('Invalid highlight name', pcall_err(meths.get_hl_by_name, '', false))
+    eq('Invalid highlight name', pcall_err(meths.nvim_get_hl_by_name, '', false))
 
     -- Test "standout" attribute. #8054
-    eq({ underline = true }, meths.get_hl_by_name('cursorline', 0))
+    eq({ underline = true }, meths.nvim_get_hl_by_name('cursorline', 0))
     command('hi CursorLine cterm=standout,underline term=standout,underline gui=standout,underline')
     command('set cursorline')
-    eq({ underline = true, standout = true }, meths.get_hl_by_name('cursorline', 0))
+    eq({ underline = true, standout = true }, meths.nvim_get_hl_by_name('cursorline', 0))
 
     -- Test cterm & Normal values. #18024 (tail) & #18980
     -- Ensure Normal, and groups that match Normal return their fg & bg cterm values
-    meths.set_hl(0, 'Normal', { ctermfg = 17, ctermbg = 213 })
-    meths.set_hl(0, 'NotNormal', { ctermfg = 17, ctermbg = 213, nocombine = true })
+    meths.nvim_set_hl(0, 'Normal', { ctermfg = 17, ctermbg = 213 })
+    meths.nvim_set_hl(0, 'NotNormal', { ctermfg = 17, ctermbg = 213, nocombine = true })
     -- Note colors are "cterm" values, not rgb-as-ints
     eq({ foreground = 17, background = 213 }, nvim('get_hl_by_name', 'Normal', false))
     eq(
@@ -146,31 +146,34 @@ describe('API: highlight', function()
 
   it('nvim_get_hl_id_by_name', function()
     -- precondition: use a hl group that does not yet exist
-    eq("Invalid highlight name: 'Shrubbery'", pcall_err(meths.get_hl_by_name, 'Shrubbery', true))
+    eq(
+      "Invalid highlight name: 'Shrubbery'",
+      pcall_err(meths.nvim_get_hl_by_name, 'Shrubbery', true)
+    )
     eq(0, funcs.hlID('Shrubbery'))
 
-    local hl_id = meths.get_hl_id_by_name('Shrubbery')
+    local hl_id = meths.nvim_get_hl_id_by_name('Shrubbery')
     ok(hl_id > 0)
     eq(hl_id, funcs.hlID('Shrubbery'))
 
     command('hi Shrubbery guifg=#888888 guibg=#888888')
     eq(
       { foreground = tonumber('0x888888'), background = tonumber('0x888888') },
-      meths.get_hl_by_id(hl_id, true)
+      meths.nvim_get_hl_by_id(hl_id, true)
     )
     eq(
       { foreground = tonumber('0x888888'), background = tonumber('0x888888') },
-      meths.get_hl_by_name('Shrubbery', true)
+      meths.nvim_get_hl_by_name('Shrubbery', true)
     )
   end)
 
   it("nvim_buf_add_highlight to other buffer doesn't crash if undo is disabled #12873", function()
     command('vsplit file')
-    local err, _ = pcall(meths.set_option_value, 'undofile', false, { buf = 1 })
+    local err, _ = pcall(meths.nvim_set_option_value, 'undofile', false, { buf = 1 })
     eq(true, err)
-    err, _ = pcall(meths.set_option_value, 'undolevels', -1, { buf = 1 })
+    err, _ = pcall(meths.nvim_set_option_value, 'undolevels', -1, { buf = 1 })
     eq(true, err)
-    err, _ = pcall(meths.buf_add_highlight, 1, -1, 'Question', 0, 0, -1)
+    err, _ = pcall(meths.nvim_buf_add_highlight, 1, -1, 'Question', 0, 0, -1)
     eq(true, err)
     assert_alive()
   end)
@@ -241,8 +244,8 @@ describe('API: set highlight', function()
   }
 
   local function get_ns()
-    local ns = meths.create_namespace('Test_set_hl')
-    meths.set_hl_ns(ns)
+    local ns = meths.nvim_create_namespace('Test_set_hl')
+    meths.nvim_set_hl_ns(ns)
     return ns
   end
 
@@ -251,51 +254,51 @@ describe('API: set highlight', function()
   it('validation', function()
     eq(
       "Invalid 'blend': out of range",
-      pcall_err(meths.set_hl, 0, 'Test_hl3', { fg = '#FF00FF', blend = 999 })
+      pcall_err(meths.nvim_set_hl, 0, 'Test_hl3', { fg = '#FF00FF', blend = 999 })
     )
     eq(
       "Invalid 'blend': expected Integer, got Array",
-      pcall_err(meths.set_hl, 0, 'Test_hl3', { fg = '#FF00FF', blend = {} })
+      pcall_err(meths.nvim_set_hl, 0, 'Test_hl3', { fg = '#FF00FF', blend = {} })
     )
   end)
 
   it('can set gui highlight', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', highlight1)
-    eq(highlight1, meths.get_hl_by_name('Test_hl', true))
+    meths.nvim_set_hl(ns, 'Test_hl', highlight1)
+    eq(highlight1, meths.nvim_get_hl_by_name('Test_hl', true))
   end)
 
   it('can set cterm highlight', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', highlight2_config)
-    eq(highlight2_result, meths.get_hl_by_name('Test_hl', false))
+    meths.nvim_set_hl(ns, 'Test_hl', highlight2_config)
+    eq(highlight2_result, meths.nvim_get_hl_by_name('Test_hl', false))
   end)
 
   it('can set empty cterm attr', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', { cterm = {} })
-    eq({}, meths.get_hl_by_name('Test_hl', false))
+    meths.nvim_set_hl(ns, 'Test_hl', { cterm = {} })
+    eq({}, meths.nvim_get_hl_by_name('Test_hl', false))
   end)
 
   it('cterm attr defaults to gui attr', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', highlight1)
+    meths.nvim_set_hl(ns, 'Test_hl', highlight1)
     eq({
       bold = true,
       italic = true,
-    }, meths.get_hl_by_name('Test_hl', false))
+    }, meths.nvim_get_hl_by_name('Test_hl', false))
   end)
 
   it('can overwrite attr for cterm', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', highlight3_config)
-    eq(highlight3_result_gui, meths.get_hl_by_name('Test_hl', true))
-    eq(highlight3_result_cterm, meths.get_hl_by_name('Test_hl', false))
+    meths.nvim_set_hl(ns, 'Test_hl', highlight3_config)
+    eq(highlight3_result_gui, meths.nvim_get_hl_by_name('Test_hl', true))
+    eq(highlight3_result_cterm, meths.nvim_get_hl_by_name('Test_hl', false))
   end)
 
   it('only allows one underline attribute #22371', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', {
+    meths.nvim_set_hl(ns, 'Test_hl', {
       underdouble = true,
       underdotted = true,
       cterm = {
@@ -303,21 +306,21 @@ describe('API: set highlight', function()
         undercurl = true,
       },
     })
-    eq({ undercurl = true }, meths.get_hl_by_name('Test_hl', false))
-    eq({ underdotted = true }, meths.get_hl_by_name('Test_hl', true))
+    eq({ undercurl = true }, meths.nvim_get_hl_by_name('Test_hl', false))
+    eq({ underdotted = true }, meths.nvim_get_hl_by_name('Test_hl', true))
   end)
 
   it('can set a highlight in the global namespace', function()
-    meths.set_hl(0, 'Test_hl', highlight2_config)
+    meths.nvim_set_hl(0, 'Test_hl', highlight2_config)
     eq(
       'Test_hl        xxx cterm=underline,reverse ctermfg=8 ctermbg=15 gui=underline,reverse',
       exec_capture('highlight Test_hl')
     )
 
-    meths.set_hl(0, 'Test_hl', { background = highlight_color.bg })
+    meths.nvim_set_hl(0, 'Test_hl', { background = highlight_color.bg })
     eq('Test_hl        xxx guibg=#0032aa', exec_capture('highlight Test_hl'))
 
-    meths.set_hl(0, 'Test_hl2', highlight3_config)
+    meths.nvim_set_hl(0, 'Test_hl2', highlight3_config)
     eq(
       'Test_hl2       xxx cterm=italic,reverse,strikethrough,altfont,nocombine ctermfg=8 ctermbg=15 gui=bold,underdashed,italic,reverse,strikethrough,altfont guifg=#ff0000 guibg=#0032aa',
       exec_capture('highlight Test_hl2')
@@ -325,58 +328,64 @@ describe('API: set highlight', function()
 
     -- Colors are stored with the name they are defined, but
     -- with canonical casing
-    meths.set_hl(0, 'Test_hl3', { bg = 'reD', fg = 'bLue' })
+    meths.nvim_set_hl(0, 'Test_hl3', { bg = 'reD', fg = 'bLue' })
     eq('Test_hl3       xxx guifg=Blue guibg=Red', exec_capture('highlight Test_hl3'))
   end)
 
   it('can modify a highlight in the global namespace', function()
-    meths.set_hl(0, 'Test_hl3', { bg = 'red', fg = 'blue' })
+    meths.nvim_set_hl(0, 'Test_hl3', { bg = 'red', fg = 'blue' })
     eq('Test_hl3       xxx guifg=Blue guibg=Red', exec_capture('highlight Test_hl3'))
 
-    meths.set_hl(0, 'Test_hl3', { bg = 'red' })
+    meths.nvim_set_hl(0, 'Test_hl3', { bg = 'red' })
     eq('Test_hl3       xxx guibg=Red', exec_capture('highlight Test_hl3'))
 
-    meths.set_hl(0, 'Test_hl3', { ctermbg = 9, ctermfg = 12 })
+    meths.nvim_set_hl(0, 'Test_hl3', { ctermbg = 9, ctermfg = 12 })
     eq('Test_hl3       xxx ctermfg=12 ctermbg=9', exec_capture('highlight Test_hl3'))
 
-    meths.set_hl(0, 'Test_hl3', { ctermbg = 'red', ctermfg = 'blue' })
+    meths.nvim_set_hl(0, 'Test_hl3', { ctermbg = 'red', ctermfg = 'blue' })
     eq('Test_hl3       xxx ctermfg=12 ctermbg=9', exec_capture('highlight Test_hl3'))
 
-    meths.set_hl(0, 'Test_hl3', { ctermbg = 9 })
+    meths.nvim_set_hl(0, 'Test_hl3', { ctermbg = 9 })
     eq('Test_hl3       xxx ctermbg=9', exec_capture('highlight Test_hl3'))
 
-    eq("Invalid highlight color: 'redd'", pcall_err(meths.set_hl, 0, 'Test_hl3', { fg = 'redd' }))
+    eq(
+      "Invalid highlight color: 'redd'",
+      pcall_err(meths.nvim_set_hl, 0, 'Test_hl3', { fg = 'redd' })
+    )
 
     eq(
       "Invalid highlight color: 'bleu'",
-      pcall_err(meths.set_hl, 0, 'Test_hl3', { ctermfg = 'bleu' })
+      pcall_err(meths.nvim_set_hl, 0, 'Test_hl3', { ctermfg = 'bleu' })
     )
 
-    meths.set_hl(0, 'Test_hl3', { fg = '#FF00FF' })
+    meths.nvim_set_hl(0, 'Test_hl3', { fg = '#FF00FF' })
     eq('Test_hl3       xxx guifg=#ff00ff', exec_capture('highlight Test_hl3'))
 
     eq(
       "Invalid highlight color: '#FF00FF'",
-      pcall_err(meths.set_hl, 0, 'Test_hl3', { ctermfg = '#FF00FF' })
+      pcall_err(meths.nvim_set_hl, 0, 'Test_hl3', { ctermfg = '#FF00FF' })
     )
 
     for _, fg_val in ipairs { nil, 'NONE', 'nOnE', '', -1 } do
-      meths.set_hl(0, 'Test_hl3', { fg = fg_val })
+      meths.nvim_set_hl(0, 'Test_hl3', { fg = fg_val })
       eq('Test_hl3       xxx cleared', exec_capture('highlight Test_hl3'))
     end
 
-    meths.set_hl(0, 'Test_hl3', { fg = '#FF00FF', blend = 50 })
+    meths.nvim_set_hl(0, 'Test_hl3', { fg = '#FF00FF', blend = 50 })
     eq('Test_hl3       xxx guifg=#ff00ff blend=50', exec_capture('highlight Test_hl3'))
   end)
 
   it("correctly sets 'Normal' internal properties", function()
     -- Normal has some special handling internally. #18024
-    meths.set_hl(0, 'Normal', { fg = '#000083', bg = '#0000F3' })
+    meths.nvim_set_hl(0, 'Normal', { fg = '#000083', bg = '#0000F3' })
     eq({ foreground = 131, background = 243 }, nvim('get_hl_by_name', 'Normal', true))
   end)
 
   it('does not segfault on invalid group name #20009', function()
-    eq("Invalid highlight name: 'foo bar'", pcall_err(meths.set_hl, 0, 'foo bar', { bold = true }))
+    eq(
+      "Invalid highlight name: 'foo bar'",
+      pcall_err(meths.nvim_set_hl, 0, 'foo bar', { bold = true })
+    )
     assert_alive()
   end)
 end)
@@ -443,14 +452,14 @@ describe('API: get highlight', function()
 
   local function get_ns()
     -- Test namespace filtering behavior
-    local ns2 = meths.create_namespace('Another_namespace')
-    meths.set_hl(ns2, 'Test_hl', { ctermfg = 23 })
-    meths.set_hl(ns2, 'Test_another_hl', { link = 'Test_hl' })
-    meths.set_hl(ns2, 'Test_hl_link', { link = 'Test_another_hl' })
-    meths.set_hl(ns2, 'Test_another_hl_link', { link = 'Test_hl_link' })
+    local ns2 = meths.nvim_create_namespace('Another_namespace')
+    meths.nvim_set_hl(ns2, 'Test_hl', { ctermfg = 23 })
+    meths.nvim_set_hl(ns2, 'Test_another_hl', { link = 'Test_hl' })
+    meths.nvim_set_hl(ns2, 'Test_hl_link', { link = 'Test_another_hl' })
+    meths.nvim_set_hl(ns2, 'Test_another_hl_link', { link = 'Test_hl_link' })
 
-    local ns = meths.create_namespace('Test_set_hl')
-    meths.set_hl_ns(ns)
+    local ns = meths.nvim_create_namespace('Test_set_hl')
+    meths.nvim_set_hl_ns(ns)
 
     return ns
   end
@@ -458,23 +467,26 @@ describe('API: get highlight', function()
   before_each(clear)
 
   it('validation', function()
-    eq("Invalid 'name': expected String, got Integer", pcall_err(meths.get_hl, 0, { name = 177 }))
-    eq('Highlight id out of bounds', pcall_err(meths.get_hl, 0, { name = 'Test set hl' }))
+    eq(
+      "Invalid 'name': expected String, got Integer",
+      pcall_err(meths.nvim_get_hl, 0, { name = 177 })
+    )
+    eq('Highlight id out of bounds', pcall_err(meths.nvim_get_hl, 0, { name = 'Test set hl' }))
   end)
 
   it('nvim_get_hl with create flag', function()
     eq({}, nvim('get_hl', 0, { name = 'Foo', create = false }))
     eq(0, funcs.hlexists('Foo'))
-    meths.get_hl(0, { name = 'Bar', create = true })
+    meths.nvim_get_hl(0, { name = 'Bar', create = true })
     eq(1, funcs.hlexists('Bar'))
-    meths.get_hl(0, { name = 'FooBar' })
+    meths.nvim_get_hl(0, { name = 'FooBar' })
     eq(1, funcs.hlexists('FooBar'))
   end)
 
   it('can get all highlights in current namespace', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', { bg = '#B4BEFE' })
-    meths.set_hl(ns, 'Test_hl_link', { link = 'Test_hl' })
+    meths.nvim_set_hl(ns, 'Test_hl', { bg = '#B4BEFE' })
+    meths.nvim_set_hl(ns, 'Test_hl_link', { link = 'Test_hl' })
     eq({
       Test_hl = {
         bg = 11845374,
@@ -482,42 +494,42 @@ describe('API: get highlight', function()
       Test_hl_link = {
         link = 'Test_hl',
       },
-    }, meths.get_hl(ns, {}))
+    }, meths.nvim_get_hl(ns, {}))
   end)
 
   it('can get gui highlight', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', highlight1)
-    eq(highlight1, meths.get_hl(ns, { name = 'Test_hl' }))
+    meths.nvim_set_hl(ns, 'Test_hl', highlight1)
+    eq(highlight1, meths.nvim_get_hl(ns, { name = 'Test_hl' }))
   end)
 
   it('can get cterm highlight', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', highlight2)
-    eq(highlight2, meths.get_hl(ns, { name = 'Test_hl' }))
+    meths.nvim_set_hl(ns, 'Test_hl', highlight2)
+    eq(highlight2, meths.nvim_get_hl(ns, { name = 'Test_hl' }))
   end)
 
   it('can get empty cterm attr', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', { cterm = {} })
-    eq({}, meths.get_hl(ns, { name = 'Test_hl' }))
+    meths.nvim_set_hl(ns, 'Test_hl', { cterm = {} })
+    eq({}, meths.nvim_get_hl(ns, { name = 'Test_hl' }))
   end)
 
   it('cterm attr defaults to gui attr', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', highlight1)
-    eq(highlight1, meths.get_hl(ns, { name = 'Test_hl' }))
+    meths.nvim_set_hl(ns, 'Test_hl', highlight1)
+    eq(highlight1, meths.nvim_get_hl(ns, { name = 'Test_hl' }))
   end)
 
   it('can overwrite attr for cterm', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', highlight3_config)
-    eq(highlight3_result, meths.get_hl(ns, { name = 'Test_hl' }))
+    meths.nvim_set_hl(ns, 'Test_hl', highlight3_config)
+    eq(highlight3_result, meths.nvim_get_hl(ns, { name = 'Test_hl' }))
   end)
 
   it('only allows one underline attribute #22371', function()
     local ns = get_ns()
-    meths.set_hl(ns, 'Test_hl', {
+    meths.nvim_set_hl(ns, 'Test_hl', {
       underdouble = true,
       underdotted = true,
       cterm = {
@@ -525,32 +537,35 @@ describe('API: get highlight', function()
         undercurl = true,
       },
     })
-    eq({ underdotted = true, cterm = { undercurl = true } }, meths.get_hl(ns, { name = 'Test_hl' }))
+    eq(
+      { underdotted = true, cterm = { undercurl = true } },
+      meths.nvim_get_hl(ns, { name = 'Test_hl' })
+    )
   end)
 
   it('can get a highlight in the global namespace', function()
-    meths.set_hl(0, 'Test_hl', highlight2)
-    eq(highlight2, meths.get_hl(0, { name = 'Test_hl' }))
+    meths.nvim_set_hl(0, 'Test_hl', highlight2)
+    eq(highlight2, meths.nvim_get_hl(0, { name = 'Test_hl' }))
 
-    meths.set_hl(0, 'Test_hl', { background = highlight_color.bg })
+    meths.nvim_set_hl(0, 'Test_hl', { background = highlight_color.bg })
     eq({
       bg = 12970,
-    }, meths.get_hl(0, { name = 'Test_hl' }))
+    }, meths.nvim_get_hl(0, { name = 'Test_hl' }))
 
-    meths.set_hl(0, 'Test_hl2', highlight3_config)
-    eq(highlight3_result, meths.get_hl(0, { name = 'Test_hl2' }))
+    meths.nvim_set_hl(0, 'Test_hl2', highlight3_config)
+    eq(highlight3_result, meths.nvim_get_hl(0, { name = 'Test_hl2' }))
 
     -- Colors are stored with the name they are defined, but
     -- with canonical casing
-    meths.set_hl(0, 'Test_hl3', { bg = 'reD', fg = 'bLue' })
+    meths.nvim_set_hl(0, 'Test_hl3', { bg = 'reD', fg = 'bLue' })
     eq({
       bg = 16711680,
       fg = 255,
-    }, meths.get_hl(0, { name = 'Test_hl3' }))
+    }, meths.nvim_get_hl(0, { name = 'Test_hl3' }))
   end)
 
   it('nvim_get_hl by id', function()
-    local hl_id = meths.get_hl_id_by_name('NewHighlight')
+    local hl_id = meths.nvim_get_hl_id_by_name('NewHighlight')
 
     command(
       'hi NewHighlight cterm=underline ctermbg=green guifg=red guibg=yellow guisp=blue gui=bold'
@@ -562,14 +577,14 @@ describe('API: get highlight', function()
       bold = true,
       ctermbg = 10,
       cterm = { underline = true },
-    }, meths.get_hl(0, { id = hl_id }))
+    }, meths.nvim_get_hl(0, { id = hl_id }))
 
     -- Test 0 argument
-    eq('Highlight id out of bounds', pcall_err(meths.get_hl, 0, { id = 0 }))
+    eq('Highlight id out of bounds', pcall_err(meths.nvim_get_hl, 0, { id = 0 }))
 
     eq(
       "Invalid 'id': expected Integer, got String",
-      pcall_err(meths.get_hl, 0, { id = 'Test_set_hl' })
+      pcall_err(meths.nvim_get_hl, 0, { id = 'Test_set_hl' })
     )
 
     -- Test all highlight properties.
@@ -587,7 +602,7 @@ describe('API: get highlight', function()
       underline = true,
       ctermbg = 10,
       cterm = { underline = true },
-    }, meths.get_hl(0, { id = hl_id }))
+    }, meths.nvim_get_hl(0, { id = hl_id }))
 
     -- Test undercurl
     command('hi NewHighlight gui=undercurl')
@@ -598,16 +613,16 @@ describe('API: get highlight', function()
       undercurl = true,
       ctermbg = 10,
       cterm = { underline = true },
-    }, meths.get_hl(0, { id = hl_id }))
+    }, meths.nvim_get_hl(0, { id = hl_id }))
   end)
 
   it('can correctly detect links', function()
     command('hi String guifg=#a6e3a1 ctermfg=NONE')
     command('hi link @string string')
     command('hi link @string.cpp @string')
-    eq({ fg = 10937249 }, meths.get_hl(0, { name = 'String' }))
-    eq({ link = 'String' }, meths.get_hl(0, { name = '@string' }))
-    eq({ fg = 10937249 }, meths.get_hl(0, { name = '@string.cpp', link = false }))
+    eq({ fg = 10937249 }, meths.nvim_get_hl(0, { name = 'String' }))
+    eq({ link = 'String' }, meths.nvim_get_hl(0, { name = '@string' }))
+    eq({ fg = 10937249 }, meths.nvim_get_hl(0, { name = '@string.cpp', link = false }))
   end)
 
   it('can get all attributes for a linked group', function()
@@ -616,55 +631,55 @@ describe('API: get highlight', function()
     command('hi! link Foo Bar')
     eq(
       { link = 'Bar', fg = tonumber('00ff00', 16), bold = true, underline = true },
-      meths.get_hl(0, { name = 'Foo', link = true })
+      meths.nvim_get_hl(0, { name = 'Foo', link = true })
     )
   end)
 
   it('can set link as well as other attributes', function()
     command('hi Bar guifg=red')
     local hl = { link = 'Bar', fg = tonumber('00ff00', 16), bold = true, cterm = { bold = true } }
-    meths.set_hl(0, 'Foo', hl)
-    eq(hl, meths.get_hl(0, { name = 'Foo', link = true }))
+    meths.nvim_set_hl(0, 'Foo', hl)
+    eq(hl, meths.nvim_get_hl(0, { name = 'Foo', link = true }))
   end)
 
   it("doesn't contain unset groups", function()
-    local id = meths.get_hl_id_by_name '@foobar.hubbabubba'
+    local id = meths.nvim_get_hl_id_by_name '@foobar.hubbabubba'
     ok(id > 0)
 
-    local data = meths.get_hl(0, {})
+    local data = meths.nvim_get_hl(0, {})
     eq(nil, data['@foobar.hubbabubba'])
     eq(nil, data['@foobar'])
 
     command 'hi @foobar.hubbabubba gui=bold'
-    data = meths.get_hl(0, {})
+    data = meths.nvim_get_hl(0, {})
     eq({ bold = true }, data['@foobar.hubbabubba'])
     eq(nil, data['@foobar'])
 
     -- @foobar.hubbabubba was explicitly cleared and thus shows up
     -- but @foobar was never touched, and thus doesn't
     command 'hi clear @foobar.hubbabubba'
-    data = meths.get_hl(0, {})
+    data = meths.nvim_get_hl(0, {})
     eq({}, data['@foobar.hubbabubba'])
     eq(nil, data['@foobar'])
   end)
 
   it('should return default flag', function()
-    meths.set_hl(0, 'Tried', { fg = '#00ff00', default = true })
-    eq({ fg = tonumber('00ff00', 16), default = true }, meths.get_hl(0, { name = 'Tried' }))
+    meths.nvim_set_hl(0, 'Tried', { fg = '#00ff00', default = true })
+    eq({ fg = tonumber('00ff00', 16), default = true }, meths.nvim_get_hl(0, { name = 'Tried' }))
   end)
 
   it('should not output empty gui and cterm #23474', function()
-    meths.set_hl(0, 'Foo', { default = true })
-    meths.set_hl(0, 'Bar', { default = true, fg = '#ffffff' })
-    meths.set_hl(0, 'FooBar', { default = true, fg = '#ffffff', cterm = { bold = true } })
-    meths.set_hl(
+    meths.nvim_set_hl(0, 'Foo', { default = true })
+    meths.nvim_set_hl(0, 'Bar', { default = true, fg = '#ffffff' })
+    meths.nvim_set_hl(0, 'FooBar', { default = true, fg = '#ffffff', cterm = { bold = true } })
+    meths.nvim_set_hl(
       0,
       'FooBarA',
       { default = true, fg = '#ffffff', cterm = { bold = true, italic = true } }
     )
 
     eq('Foo            xxx cleared', exec_capture('highlight Foo'))
-    eq({ default = true }, meths.get_hl(0, { name = 'Foo' }))
+    eq({ default = true }, meths.nvim_get_hl(0, { name = 'Foo' }))
     eq('Bar            xxx guifg=#ffffff', exec_capture('highlight Bar'))
     eq('FooBar         xxx cterm=bold guifg=#ffffff', exec_capture('highlight FooBar'))
     eq('FooBarA        xxx cterm=bold,italic guifg=#ffffff', exec_capture('highlight FooBarA'))
@@ -673,27 +688,27 @@ describe('API: get highlight', function()
   it('can override exist highlight group by force #20323', function()
     local white = tonumber('ffffff', 16)
     local green = tonumber('00ff00', 16)
-    meths.set_hl(0, 'Foo', { fg = white })
-    meths.set_hl(0, 'Foo', { fg = green, force = true })
-    eq({ fg = green }, meths.get_hl(0, { name = 'Foo' }))
-    meths.set_hl(0, 'Bar', { link = 'Comment', default = true })
-    meths.set_hl(0, 'Bar', { link = 'Foo', default = true, force = true })
-    eq({ link = 'Foo', default = true }, meths.get_hl(0, { name = 'Bar' }))
+    meths.nvim_set_hl(0, 'Foo', { fg = white })
+    meths.nvim_set_hl(0, 'Foo', { fg = green, force = true })
+    eq({ fg = green }, meths.nvim_get_hl(0, { name = 'Foo' }))
+    meths.nvim_set_hl(0, 'Bar', { link = 'Comment', default = true })
+    meths.nvim_set_hl(0, 'Bar', { link = 'Foo', default = true, force = true })
+    eq({ link = 'Foo', default = true }, meths.nvim_get_hl(0, { name = 'Bar' }))
   end)
 end)
 
 describe('API: set/get highlight namespace', function()
   it('set/get highlight namespace', function()
-    eq(0, meths.get_hl_ns({}))
-    local ns = meths.create_namespace('')
-    meths.set_hl_ns(ns)
-    eq(ns, meths.get_hl_ns({}))
+    eq(0, meths.nvim_get_hl_ns({}))
+    local ns = meths.nvim_create_namespace('')
+    meths.nvim_set_hl_ns(ns)
+    eq(ns, meths.nvim_get_hl_ns({}))
   end)
 
   it('set/get window highlight namespace', function()
-    eq(-1, meths.get_hl_ns({ winid = 0 }))
-    local ns = meths.create_namespace('')
-    meths.win_set_hl_ns(0, ns)
-    eq(ns, meths.get_hl_ns({ winid = 0 }))
+    eq(-1, meths.nvim_get_hl_ns({ winid = 0 }))
+    local ns = meths.nvim_create_namespace('')
+    meths.nvim_win_set_hl_ns(0, ns)
+    eq(ns, meths.nvim_get_hl_ns({ winid = 0 }))
   end)
 end)
diff --git a/test/functional/api/keymap_spec.lua b/test/functional/api/keymap_spec.lua
index 789ad28544..f633c96a7c 100644
--- a/test/functional/api/keymap_spec.lua
+++ b/test/functional/api/keymap_spec.lua
@@ -57,7 +57,7 @@ describe('nvim_get_keymap', function()
   }
 
   it('returns empty list when no map', function()
-    eq({}, meths.get_keymap('n'))
+    eq({}, meths.nvim_get_keymap('n'))
   end)
 
   it('returns list of all applicable mappings', function()
@@ -66,8 +66,8 @@ describe('nvim_get_keymap', function()
     -- Should be the same as the dictionary we supplied earlier
     -- and the dictionary you would get from maparg
     -- since this is a global map, and not script local
-    eq({ foo_bar_map_table }, meths.get_keymap('n'))
-    eq({ funcs.maparg('foo', 'n', false, true) }, meths.get_keymap('n'))
+    eq({ foo_bar_map_table }, meths.nvim_get_keymap('n'))
+    eq({ funcs.maparg('foo', 'n', false, true) }, meths.nvim_get_keymap('n'))
 
     -- Add another mapping
     command('nnoremap foo_longer bar_longer')
@@ -76,11 +76,11 @@ describe('nvim_get_keymap', function()
     foolong_bar_map_table['lhsraw'] = 'foo_longer'
     foolong_bar_map_table['rhs'] = 'bar_longer'
 
-    eq({ foolong_bar_map_table, foo_bar_map_table }, meths.get_keymap('n'))
+    eq({ foolong_bar_map_table, foo_bar_map_table }, meths.nvim_get_keymap('n'))
 
     -- Remove a mapping
     command('unmap foo_longer')
-    eq({ foo_bar_map_table }, meths.get_keymap('n'))
+    eq({ foo_bar_map_table }, meths.nvim_get_keymap('n'))
   end)
 
   it('works for other modes', function()
@@ -94,7 +94,7 @@ describe('nvim_get_keymap', function()
     insert_table['mode'] = 'i'
     insert_table['mode_bits'] = 0x10
 
-    eq({ insert_table }, meths.get_keymap('i'))
+    eq({ insert_table }, meths.nvim_get_keymap('i'))
   end)
 
   it('considers scope', function()
@@ -111,7 +111,7 @@ describe('nvim_get_keymap', function()
     command('nnoremap <buffer> foo bar')
 
     -- The buffer mapping should not show up
-    eq({ foolong_bar_map_table }, meths.get_keymap('n'))
+    eq({ foolong_bar_map_table }, meths.nvim_get_keymap('n'))
     eq({ buffer_table }, curbufmeths.get_keymap('n'))
   end)
 
@@ -123,7 +123,7 @@ describe('nvim_get_keymap', function()
 
     command('nnoremap <buffer> foo bar')
 
-    eq({ foo_bar_map_table }, meths.get_keymap('n'))
+    eq({ foo_bar_map_table }, meths.nvim_get_keymap('n'))
     eq({ buffer_table }, curbufmeths.get_keymap('n'))
   end)
 
@@ -143,15 +143,15 @@ describe('nvim_get_keymap', function()
     -- Final buffer will have buffer mappings
     local buffer_table = shallowcopy(foo_bar_map_table)
     buffer_table['buffer'] = final_buffer
-    eq({ buffer_table }, meths.buf_get_keymap(final_buffer, 'n'))
-    eq({ buffer_table }, meths.buf_get_keymap(0, 'n'))
+    eq({ buffer_table }, meths.nvim_buf_get_keymap(final_buffer, 'n'))
+    eq({ buffer_table }, meths.nvim_buf_get_keymap(0, 'n'))
 
     command('buffer ' .. original_buffer)
     eq(original_buffer, curbufmeths.get_number())
     -- Original buffer won't have any mappings
-    eq({}, meths.get_keymap('n'))
+    eq({}, meths.nvim_get_keymap('n'))
     eq({}, curbufmeths.get_keymap('n'))
-    eq({ buffer_table }, meths.buf_get_keymap(final_buffer, 'n'))
+    eq({ buffer_table }, meths.nvim_buf_get_keymap(final_buffer, 'n'))
   end)
 
   -- Test toggle switches for basic options
@@ -191,7 +191,7 @@ describe('nvim_get_keymap', function()
         function()
           make_new_windows(new_windows)
           command(map .. ' ' .. option_token .. ' foo bar')
-          local result = meths.get_keymap(mode)[1][option]
+          local result = meths.nvim_get_keymap(mode)[1][option]
           eq(global_on_result, result)
         end
       )
@@ -228,7 +228,7 @@ describe('nvim_get_keymap', function()
         function()
           make_new_windows(new_windows)
           command(map .. ' baz bat')
-          local result = meths.get_keymap(mode)[1][option]
+          local result = meths.nvim_get_keymap(mode)[1][option]
           eq(global_off_result, result)
         end
       )
@@ -277,9 +277,9 @@ describe('nvim_get_keymap', function()
 
       nnoremap fizz :call <SID>maparg_test_function()<CR>
     ]])
-    local sid_result = meths.get_keymap('n')[1]['sid']
+    local sid_result = meths.nvim_get_keymap('n')[1]['sid']
     eq(1, sid_result)
-    eq('testing', meths.call_function('<SNR>' .. sid_result .. '_maparg_test_function', {}))
+    eq('testing', meths.nvim_call_function('<SNR>' .. sid_result .. '_maparg_test_function', {}))
   end)
 
   it('returns script numbers for buffer maps', function()
@@ -292,13 +292,13 @@ describe('nvim_get_keymap', function()
     ]])
     local sid_result = curbufmeths.get_keymap('n')[1]['sid']
     eq(1, sid_result)
-    eq('testing', meths.call_function('<SNR>' .. sid_result .. '_maparg_test_function', {}))
+    eq('testing', meths.nvim_call_function('<SNR>' .. sid_result .. '_maparg_test_function', {}))
   end)
 
   it('works with <F12> and others', function()
     command('nnoremap <F12> :let g:maparg_test_var = 1<CR>')
-    eq('<F12>', meths.get_keymap('n')[1]['lhs'])
-    eq(':let g:maparg_test_var = 1<CR>', meths.get_keymap('n')[1]['rhs'])
+    eq('<F12>', meths.nvim_get_keymap('n')[1]['lhs'])
+    eq(':let g:maparg_test_var = 1<CR>', meths.nvim_get_keymap('n')[1]['rhs'])
   end)
 
   it('works correctly despite various &cpo settings', function()
@@ -341,7 +341,7 @@ describe('nvim_get_keymap', function()
 
     -- wrapper around get_keymap() that drops "lhsraw" and "lhsrawalt" which are hard to check
     local function get_keymap_noraw(...)
-      local ret = meths.get_keymap(...)
+      local ret = meths.nvim_get_keymap(...)
       for _, item in ipairs(ret) do
         item.lhsraw = nil
         item.lhsrawalt = nil
@@ -392,7 +392,7 @@ describe('nvim_get_keymap', function()
       lnum = 0,
     }
     command('nnoremap \\|<Char-0x20><Char-32><Space><Bar> \\|<Char-0x20><Char-32><Space> <Bar>')
-    eq({ space_table }, meths.get_keymap('n'))
+    eq({ space_table }, meths.nvim_get_keymap('n'))
   end)
 
   it('can handle lua mappings', function()
@@ -421,7 +421,7 @@ describe('nvim_get_keymap', function()
     ]])
     eq(3, exec_lua([[return GlobalCount]]))
 
-    local mapargs = meths.get_keymap('n')
+    local mapargs = meths.nvim_get_keymap('n')
     mapargs[1].callback = nil
     eq({
       lhs = 'asdf',
@@ -442,7 +442,7 @@ describe('nvim_get_keymap', function()
   end)
 
   it('can handle map descriptions', function()
-    meths.set_keymap('n', 'lhs', 'rhs', { desc = 'map description' })
+    meths.nvim_set_keymap('n', 'lhs', 'rhs', { desc = 'map description' })
     eq({
       lhs = 'lhs',
       lhsraw = 'lhs',
@@ -460,7 +460,7 @@ describe('nvim_get_keymap', function()
       noremap = 0,
       lnum = 0,
       desc = 'map description',
-    }, meths.get_keymap('n')[1])
+    }, meths.nvim_get_keymap('n')[1])
   end)
 end)
 
@@ -522,9 +522,9 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
 
   it('error on empty LHS', function()
     -- escape parentheses in lua string, else comparison fails erroneously
-    eq('Invalid (empty) LHS', pcall_err(meths.set_keymap, '', '', 'rhs', {}))
-    eq('Invalid (empty) LHS', pcall_err(meths.set_keymap, '', '', '', {}))
-    eq('Invalid (empty) LHS', pcall_err(meths.del_keymap, '', ''))
+    eq('Invalid (empty) LHS', pcall_err(meths.nvim_set_keymap, '', '', 'rhs', {}))
+    eq('Invalid (empty) LHS', pcall_err(meths.nvim_set_keymap, '', '', '', {}))
+    eq('Invalid (empty) LHS', pcall_err(meths.nvim_del_keymap, '', ''))
   end)
 
   it('error if LHS longer than MAXMAPLEN', function()
@@ -536,16 +536,19 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     end
 
     -- exactly 50 chars should be fine
-    meths.set_keymap('', lhs, 'rhs', {})
+    meths.nvim_set_keymap('', lhs, 'rhs', {})
 
     -- del_keymap should unmap successfully
-    meths.del_keymap('', lhs)
+    meths.nvim_del_keymap('', lhs)
     eq({}, get_mapargs('', lhs))
 
     -- 51 chars should produce an error
     lhs = lhs .. '1'
-    eq('LHS exceeds maximum map length: ' .. lhs, pcall_err(meths.set_keymap, '', lhs, 'rhs', {}))
-    eq('LHS exceeds maximum map length: ' .. lhs, pcall_err(meths.del_keymap, '', lhs))
+    eq(
+      'LHS exceeds maximum map length: ' .. lhs,
+      pcall_err(meths.nvim_set_keymap, '', lhs, 'rhs', {})
+    )
+    eq('LHS exceeds maximum map length: ' .. lhs, pcall_err(meths.nvim_del_keymap, '', lhs))
   end)
 
   it('does not throw errors when rhs is longer than MAXMAPLEN', function()
@@ -555,56 +558,65 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
       rhs = rhs .. (i % 10)
     end
     rhs = rhs .. '1'
-    meths.set_keymap('', 'lhs', rhs, {})
+    meths.nvim_set_keymap('', 'lhs', rhs, {})
     eq(generate_mapargs('', 'lhs', rhs), get_mapargs('', 'lhs'))
   end)
 
   it('error on invalid mode shortname', function()
-    eq('Invalid mode shortname: " "', pcall_err(meths.set_keymap, ' ', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "m"', pcall_err(meths.set_keymap, 'm', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "?"', pcall_err(meths.set_keymap, '?', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "y"', pcall_err(meths.set_keymap, 'y', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "p"', pcall_err(meths.set_keymap, 'p', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "a"', pcall_err(meths.set_keymap, 'a', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "oa"', pcall_err(meths.set_keymap, 'oa', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "!o"', pcall_err(meths.set_keymap, '!o', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "!i"', pcall_err(meths.set_keymap, '!i', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "!!"', pcall_err(meths.set_keymap, '!!', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "map"', pcall_err(meths.set_keymap, 'map', 'lhs', 'rhs', {}))
-    eq('Invalid mode shortname: "vmap"', pcall_err(meths.set_keymap, 'vmap', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: " "', pcall_err(meths.nvim_set_keymap, ' ', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "m"', pcall_err(meths.nvim_set_keymap, 'm', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "?"', pcall_err(meths.nvim_set_keymap, '?', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "y"', pcall_err(meths.nvim_set_keymap, 'y', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "p"', pcall_err(meths.nvim_set_keymap, 'p', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "a"', pcall_err(meths.nvim_set_keymap, 'a', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "oa"', pcall_err(meths.nvim_set_keymap, 'oa', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "!o"', pcall_err(meths.nvim_set_keymap, '!o', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "!i"', pcall_err(meths.nvim_set_keymap, '!i', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "!!"', pcall_err(meths.nvim_set_keymap, '!!', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "map"', pcall_err(meths.nvim_set_keymap, 'map', 'lhs', 'rhs', {}))
+    eq('Invalid mode shortname: "vmap"', pcall_err(meths.nvim_set_keymap, 'vmap', 'lhs', 'rhs', {}))
     eq(
       'Invalid mode shortname: "xnoremap"',
-      pcall_err(meths.set_keymap, 'xnoremap', 'lhs', 'rhs', {})
+      pcall_err(meths.nvim_set_keymap, 'xnoremap', 'lhs', 'rhs', {})
     )
-    eq('Invalid mode shortname: " "', pcall_err(meths.del_keymap, ' ', 'lhs'))
-    eq('Invalid mode shortname: "m"', pcall_err(meths.del_keymap, 'm', 'lhs'))
-    eq('Invalid mode shortname: "?"', pcall_err(meths.del_keymap, '?', 'lhs'))
-    eq('Invalid mode shortname: "y"', pcall_err(meths.del_keymap, 'y', 'lhs'))
-    eq('Invalid mode shortname: "p"', pcall_err(meths.del_keymap, 'p', 'lhs'))
-    eq('Invalid mode shortname: "a"', pcall_err(meths.del_keymap, 'a', 'lhs'))
-    eq('Invalid mode shortname: "oa"', pcall_err(meths.del_keymap, 'oa', 'lhs'))
-    eq('Invalid mode shortname: "!o"', pcall_err(meths.del_keymap, '!o', 'lhs'))
-    eq('Invalid mode shortname: "!i"', pcall_err(meths.del_keymap, '!i', 'lhs'))
-    eq('Invalid mode shortname: "!!"', pcall_err(meths.del_keymap, '!!', 'lhs'))
-    eq('Invalid mode shortname: "map"', pcall_err(meths.del_keymap, 'map', 'lhs'))
-    eq('Invalid mode shortname: "vmap"', pcall_err(meths.del_keymap, 'vmap', 'lhs'))
-    eq('Invalid mode shortname: "xnoremap"', pcall_err(meths.del_keymap, 'xnoremap', 'lhs'))
+    eq('Invalid mode shortname: " "', pcall_err(meths.nvim_del_keymap, ' ', 'lhs'))
+    eq('Invalid mode shortname: "m"', pcall_err(meths.nvim_del_keymap, 'm', 'lhs'))
+    eq('Invalid mode shortname: "?"', pcall_err(meths.nvim_del_keymap, '?', 'lhs'))
+    eq('Invalid mode shortname: "y"', pcall_err(meths.nvim_del_keymap, 'y', 'lhs'))
+    eq('Invalid mode shortname: "p"', pcall_err(meths.nvim_del_keymap, 'p', 'lhs'))
+    eq('Invalid mode shortname: "a"', pcall_err(meths.nvim_del_keymap, 'a', 'lhs'))
+    eq('Invalid mode shortname: "oa"', pcall_err(meths.nvim_del_keymap, 'oa', 'lhs'))
+    eq('Invalid mode shortname: "!o"', pcall_err(meths.nvim_del_keymap, '!o', 'lhs'))
+    eq('Invalid mode shortname: "!i"', pcall_err(meths.nvim_del_keymap, '!i', 'lhs'))
+    eq('Invalid mode shortname: "!!"', pcall_err(meths.nvim_del_keymap, '!!', 'lhs'))
+    eq('Invalid mode shortname: "map"', pcall_err(meths.nvim_del_keymap, 'map', 'lhs'))
+    eq('Invalid mode shortname: "vmap"', pcall_err(meths.nvim_del_keymap, 'vmap', 'lhs'))
+    eq('Invalid mode shortname: "xnoremap"', pcall_err(meths.nvim_del_keymap, 'xnoremap', 'lhs'))
   end)
 
   it('error on invalid optnames', function()
-    eq("Invalid key: 'silentt'", pcall_err(meths.set_keymap, 'n', 'lhs', 'rhs', { silentt = true }))
-    eq("Invalid key: 'sidd'", pcall_err(meths.set_keymap, 'n', 'lhs', 'rhs', { sidd = false }))
-    eq("Invalid key: 'nowaiT'", pcall_err(meths.set_keymap, 'n', 'lhs', 'rhs', { nowaiT = false }))
+    eq(
+      "Invalid key: 'silentt'",
+      pcall_err(meths.nvim_set_keymap, 'n', 'lhs', 'rhs', { silentt = true })
+    )
+    eq("Invalid key: 'sidd'", pcall_err(meths.nvim_set_keymap, 'n', 'lhs', 'rhs', { sidd = false }))
+    eq(
+      "Invalid key: 'nowaiT'",
+      pcall_err(meths.nvim_set_keymap, 'n', 'lhs', 'rhs', { nowaiT = false })
+    )
   end)
 
   it('error on <buffer> option key', function()
-    eq("Invalid key: 'buffer'", pcall_err(meths.set_keymap, 'n', 'lhs', 'rhs', { buffer = true }))
+    eq(
+      "Invalid key: 'buffer'",
+      pcall_err(meths.nvim_set_keymap, 'n', 'lhs', 'rhs', { buffer = true })
+    )
   end)
 
   it('error when "replace_keycodes" is used without "expr"', function()
     eq(
       '"replace_keycodes" requires "expr"',
-      pcall_err(meths.set_keymap, 'n', 'lhs', 'rhs', { replace_keycodes = true })
+      pcall_err(meths.nvim_set_keymap, 'n', 'lhs', 'rhs', { replace_keycodes = true })
     )
   end)
 
@@ -614,45 +626,45 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     it('throws an error when given non-boolean value for ' .. opt, function()
       local opts = {}
       opts[opt] = 'fooo'
-      eq(opt .. ' is not a boolean', pcall_err(meths.set_keymap, 'n', 'lhs', 'rhs', opts))
+      eq(opt .. ' is not a boolean', pcall_err(meths.nvim_set_keymap, 'n', 'lhs', 'rhs', opts))
     end)
   end
 
   -- Perform tests of basic functionality
   it('sets ordinary mappings', function()
-    meths.set_keymap('n', 'lhs', 'rhs', {})
+    meths.nvim_set_keymap('n', 'lhs', 'rhs', {})
     eq(generate_mapargs('n', 'lhs', 'rhs'), get_mapargs('n', 'lhs'))
 
-    meths.set_keymap('v', 'lhs', 'rhs', {})
+    meths.nvim_set_keymap('v', 'lhs', 'rhs', {})
     eq(generate_mapargs('v', 'lhs', 'rhs'), get_mapargs('v', 'lhs'))
   end)
 
   it('does not throw when LHS or RHS have leading/trailing whitespace', function()
-    meths.set_keymap('n', '   lhs', 'rhs', {})
+    meths.nvim_set_keymap('n', '   lhs', 'rhs', {})
     eq(generate_mapargs('n', '<Space><Space><Space>lhs', 'rhs'), get_mapargs('n', '   lhs'))
 
-    meths.set_keymap('n', 'lhs    ', 'rhs', {})
+    meths.nvim_set_keymap('n', 'lhs    ', 'rhs', {})
     eq(generate_mapargs('n', 'lhs<Space><Space><Space><Space>', 'rhs'), get_mapargs('n', 'lhs    '))
 
-    meths.set_keymap('v', ' lhs  ', '\trhs\t\f', {})
+    meths.nvim_set_keymap('v', ' lhs  ', '\trhs\t\f', {})
     eq(generate_mapargs('v', '<Space>lhs<Space><Space>', '\trhs\t\f'), get_mapargs('v', ' lhs  '))
   end)
 
   it('can set noremap mappings', function()
-    meths.set_keymap('x', 'lhs', 'rhs', { noremap = true })
+    meths.nvim_set_keymap('x', 'lhs', 'rhs', { noremap = true })
     eq(generate_mapargs('x', 'lhs', 'rhs', { noremap = true }), get_mapargs('x', 'lhs'))
 
-    meths.set_keymap('t', 'lhs', 'rhs', { noremap = true })
+    meths.nvim_set_keymap('t', 'lhs', 'rhs', { noremap = true })
     eq(generate_mapargs('t', 'lhs', 'rhs', { noremap = true }), get_mapargs('t', 'lhs'))
   end)
 
   it('can unmap mappings', function()
-    meths.set_keymap('v', 'lhs', 'rhs', {})
-    meths.del_keymap('v', 'lhs')
+    meths.nvim_set_keymap('v', 'lhs', 'rhs', {})
+    meths.nvim_del_keymap('v', 'lhs')
     eq({}, get_mapargs('v', 'lhs'))
 
-    meths.set_keymap('t', 'lhs', 'rhs', { noremap = true })
-    meths.del_keymap('t', 'lhs')
+    meths.nvim_set_keymap('t', 'lhs', 'rhs', { noremap = true })
+    meths.nvim_del_keymap('t', 'lhs')
     eq({}, get_mapargs('t', 'lhs'))
   end)
 
@@ -660,8 +672,8 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
   it('"!" and empty string are synonyms for mapmode-nvo', function()
     local nvo_shortnames = { '', '!' }
     for _, name in ipairs(nvo_shortnames) do
-      meths.set_keymap(name, 'lhs', 'rhs', {})
-      meths.del_keymap(name, 'lhs')
+      meths.nvim_set_keymap(name, 'lhs', 'rhs', {})
+      meths.nvim_del_keymap(name, 'lhs')
       eq({}, get_mapargs(name, 'lhs'))
     end
   end)
@@ -671,46 +683,46 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     for _, rhs in ipairs(special_chars) do
       local mapmode = '!'
       it('can set mappings with special characters, lhs: ' .. lhs .. ', rhs: ' .. rhs, function()
-        meths.set_keymap(mapmode, lhs, rhs, {})
+        meths.nvim_set_keymap(mapmode, lhs, rhs, {})
         eq(generate_mapargs(mapmode, lhs, rhs), get_mapargs(mapmode, lhs))
       end)
     end
   end
 
   it('can set mappings containing literal keycodes', function()
-    meths.set_keymap('n', '\n\r\n', 'rhs', {})
+    meths.nvim_set_keymap('n', '\n\r\n', 'rhs', {})
     local expected = generate_mapargs('n', '<NL><CR><NL>', 'rhs')
     eq(expected, get_mapargs('n', '<NL><CR><NL>'))
   end)
 
   it('can set mappings whose RHS is a <Nop>', function()
-    meths.set_keymap('i', 'lhs', '<Nop>', {})
+    meths.nvim_set_keymap('i', 'lhs', '<Nop>', {})
     command('normal ilhs')
     eq({ '' }, curbufmeths.get_lines(0, -1, 0)) -- imap to <Nop> does nothing
     eq(generate_mapargs('i', 'lhs', '<Nop>', {}), get_mapargs('i', 'lhs'))
 
     -- also test for case insensitivity
-    meths.set_keymap('i', 'lhs', '<nOp>', {})
+    meths.nvim_set_keymap('i', 'lhs', '<nOp>', {})
     command('normal ilhs')
     eq({ '' }, curbufmeths.get_lines(0, -1, 0))
     -- note: RHS in returned mapargs() dict reflects the original RHS
     -- provided by the user
     eq(generate_mapargs('i', 'lhs', '<nOp>', {}), get_mapargs('i', 'lhs'))
 
-    meths.set_keymap('i', 'lhs', '<NOP>', {})
+    meths.nvim_set_keymap('i', 'lhs', '<NOP>', {})
     command('normal ilhs')
     eq({ '' }, curbufmeths.get_lines(0, -1, 0))
     eq(generate_mapargs('i', 'lhs', '<NOP>', {}), get_mapargs('i', 'lhs'))
 
     -- a single ^V in RHS is also <Nop> (see :h map-empty-rhs)
-    meths.set_keymap('i', 'lhs', '\022', {})
+    meths.nvim_set_keymap('i', 'lhs', '\022', {})
     command('normal ilhs')
     eq({ '' }, curbufmeths.get_lines(0, -1, 0))
     eq(generate_mapargs('i', 'lhs', '\022', {}), get_mapargs('i', 'lhs'))
   end)
 
   it('treats an empty RHS in a mapping like a <Nop>', function()
-    meths.set_keymap('i', 'lhs', '', {})
+    meths.nvim_set_keymap('i', 'lhs', '', {})
     command('normal ilhs')
     eq({ '' }, curbufmeths.get_lines(0, -1, 0))
     eq(generate_mapargs('i', 'lhs', '', {}), get_mapargs('i', 'lhs'))
@@ -720,8 +732,8 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     -- Taken from the legacy test: test_mapping.vim. Exposes a bug in which
     -- replace_termcodes changes the length of the mapping's LHS, but
     -- do_map continues to use the *old* length of LHS.
-    meths.set_keymap('i', '<M-">', 'foo', {})
-    meths.del_keymap('i', '<M-">')
+    meths.nvim_set_keymap('i', '<M-">', 'foo', {})
+    meths.nvim_del_keymap('i', '<M-">')
     eq({}, get_mapargs('i', '<M-">'))
   end)
 
@@ -736,13 +748,13 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
   )
 
   it('throws appropriate error messages when setting <unique> maps', function()
-    meths.set_keymap('l', 'lhs', 'rhs', {})
+    meths.nvim_set_keymap('l', 'lhs', 'rhs', {})
     eq(
       'E227: mapping already exists for lhs',
-      pcall_err(meths.set_keymap, 'l', 'lhs', 'rhs', { unique = true })
+      pcall_err(meths.nvim_set_keymap, 'l', 'lhs', 'rhs', { unique = true })
     )
     -- different mapmode, no error should be thrown
-    meths.set_keymap('t', 'lhs', 'rhs', { unique = true })
+    meths.nvim_set_keymap('t', 'lhs', 'rhs', { unique = true })
   end)
 
   it('can set <expr> mappings whose RHS change dynamically', function()
@@ -753,12 +765,12 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
           return g:flip
         endfunction
         ]])
-    eq(1, meths.call_function('FlipFlop', {}))
-    eq(0, meths.call_function('FlipFlop', {}))
-    eq(1, meths.call_function('FlipFlop', {}))
-    eq(0, meths.call_function('FlipFlop', {}))
+    eq(1, meths.nvim_call_function('FlipFlop', {}))
+    eq(0, meths.nvim_call_function('FlipFlop', {}))
+    eq(1, meths.nvim_call_function('FlipFlop', {}))
+    eq(0, meths.nvim_call_function('FlipFlop', {}))
 
-    meths.set_keymap('i', 'lhs', 'FlipFlop()', { expr = true })
+    meths.nvim_set_keymap('i', 'lhs', 'FlipFlop()', { expr = true })
     command('normal ilhs')
     eq({ '1' }, curbufmeths.get_lines(0, -1, 0))
 
@@ -769,8 +781,8 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
   end)
 
   it('can set mappings that do trigger other mappings', function()
-    meths.set_keymap('i', 'mhs', 'rhs', {})
-    meths.set_keymap('i', 'lhs', 'mhs', {})
+    meths.nvim_set_keymap('i', 'mhs', 'rhs', {})
+    meths.nvim_set_keymap('i', 'lhs', 'mhs', {})
 
     command('normal imhs')
     eq({ 'rhs' }, curbufmeths.get_lines(0, -1, 0))
@@ -782,8 +794,8 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
   end)
 
   it("can set noremap mappings that don't trigger other mappings", function()
-    meths.set_keymap('i', 'mhs', 'rhs', {})
-    meths.set_keymap('i', 'lhs', 'mhs', { noremap = true })
+    meths.nvim_set_keymap('i', 'mhs', 'rhs', {})
+    meths.nvim_set_keymap('i', 'lhs', 'mhs', { noremap = true })
 
     command('normal imhs')
     eq({ 'rhs' }, curbufmeths.get_lines(0, -1, 0))
@@ -795,8 +807,8 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
   end)
 
   it('can set nowait mappings that fire without waiting', function()
-    meths.set_keymap('i', '123456', 'longer', {})
-    meths.set_keymap('i', '123', 'shorter', { nowait = true })
+    meths.nvim_set_keymap('i', '123456', 'longer', {})
+    meths.nvim_set_keymap('i', '123', 'shorter', { nowait = true })
 
     -- feed keys one at a time; if all keys arrive atomically, the longer
     -- mapping will trigger
@@ -812,22 +824,22 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
   local mapmodes = { 'n', 'v', 'x', 's', 'o', '!', 'i', 'l', 'c', 't', '', 'ia', 'ca', '!a' }
   for _, mapmode in ipairs(mapmodes) do
     it('can set/unset normal mappings in mapmode ' .. mapmode, function()
-      meths.set_keymap(mapmode, 'lhs', 'rhs', {})
+      meths.nvim_set_keymap(mapmode, 'lhs', 'rhs', {})
       eq(generate_mapargs(mapmode, 'lhs', 'rhs'), get_mapargs(mapmode, 'lhs'))
 
       -- some mapmodes (like 'o') will prevent other mapmodes (like '!') from
       -- taking effect, so unmap after each mapping
-      meths.del_keymap(mapmode, 'lhs')
+      meths.nvim_del_keymap(mapmode, 'lhs')
       eq({}, get_mapargs(mapmode, 'lhs'))
     end)
   end
 
   for _, mapmode in ipairs(mapmodes) do
     it('can set/unset noremap mappings using mapmode ' .. mapmode, function()
-      meths.set_keymap(mapmode, 'lhs', 'rhs', { noremap = true })
+      meths.nvim_set_keymap(mapmode, 'lhs', 'rhs', { noremap = true })
       eq(generate_mapargs(mapmode, 'lhs', 'rhs', { noremap = true }), get_mapargs(mapmode, 'lhs'))
 
-      meths.del_keymap(mapmode, 'lhs')
+      meths.nvim_del_keymap(mapmode, 'lhs')
       eq({}, get_mapargs(mapmode, 'lhs'))
     end)
   end
@@ -839,12 +851,12 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     -- Test with single mappings
     for _, maparg in ipairs(optnames) do
       it('can set/unset ' .. mapmode .. '-mappings with maparg: ' .. maparg, function()
-        meths.set_keymap(mapmode, 'lhs', 'rhs', { [maparg] = true })
+        meths.nvim_set_keymap(mapmode, 'lhs', 'rhs', { [maparg] = true })
         eq(
           generate_mapargs(mapmode, 'lhs', 'rhs', { [maparg] = true }),
           get_mapargs(mapmode, 'lhs')
         )
-        meths.del_keymap(mapmode, 'lhs')
+        meths.nvim_del_keymap(mapmode, 'lhs')
         eq({}, get_mapargs(mapmode, 'lhs'))
       end)
       it(
@@ -854,9 +866,9 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
           .. maparg
           .. ', whose value is false',
         function()
-          meths.set_keymap(mapmode, 'lhs', 'rhs', { [maparg] = false })
+          meths.nvim_set_keymap(mapmode, 'lhs', 'rhs', { [maparg] = false })
           eq(generate_mapargs(mapmode, 'lhs', 'rhs'), get_mapargs(mapmode, 'lhs'))
-          meths.del_keymap(mapmode, 'lhs')
+          meths.nvim_del_keymap(mapmode, 'lhs')
           eq({}, get_mapargs(mapmode, 'lhs'))
         end
       )
@@ -876,9 +888,9 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
           .. opt3,
         function()
           local opts = { [opt1] = true, [opt2] = false, [opt3] = true }
-          meths.set_keymap(mapmode, 'lhs', 'rhs', opts)
+          meths.nvim_set_keymap(mapmode, 'lhs', 'rhs', opts)
           eq(generate_mapargs(mapmode, 'lhs', 'rhs', opts), get_mapargs(mapmode, 'lhs'))
-          meths.del_keymap(mapmode, 'lhs')
+          meths.nvim_del_keymap(mapmode, 'lhs')
           eq({}, get_mapargs(mapmode, 'lhs'))
         end
       )
@@ -958,7 +970,7 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
 
     feed('aa')
 
-    eq({ 'π<M-π>foo<' }, meths.buf_get_lines(0, 0, -1, false))
+    eq({ 'π<M-π>foo<' }, meths.nvim_buf_get_lines(0, 0, -1, false))
   end)
 
   it('can make lua expr mappings without replacing keycodes', function()
@@ -968,7 +980,7 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
 
     feed('iaa<esc>')
 
-    eq({ '<space>' }, meths.buf_get_lines(0, 0, -1, false))
+    eq({ '<space>' }, meths.nvim_buf_get_lines(0, 0, -1, false))
   end)
 
   it('lua expr mapping returning nil is equivalent to returning an empty string', function()
@@ -978,7 +990,7 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
 
     feed('iaa<esc>')
 
-    eq({ '' }, meths.buf_get_lines(0, 0, -1, false))
+    eq({ '' }, meths.nvim_buf_get_lines(0, 0, -1, false))
   end)
 
   it('does not reset pum in lua mapping', function()
@@ -1081,7 +1093,7 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
   end)
 
   it('can set descriptions on mappings', function()
-    meths.set_keymap('n', 'lhs', 'rhs', { desc = 'map description' })
+    meths.nvim_set_keymap('n', 'lhs', 'rhs', { desc = 'map description' })
     eq(generate_mapargs('n', 'lhs', 'rhs', { desc = 'map description' }), get_mapargs('n', 'lhs'))
     eq('\nn  lhs           rhs\n                 map description', helpers.exec_capture('nmap lhs'))
   end)
@@ -1096,10 +1108,10 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     ]]
 
     feed 'iThe foo and the bar and the foo again<esc>'
-    eq('The 1 and the bar and the 2 again', meths.get_current_line())
+    eq('The 1 and the bar and the 2 again', meths.nvim_get_current_line())
 
     feed ':let x = "The foo is the one"<cr>'
-    eq('The 3 is the one', meths.eval 'x')
+    eq('The 3 is the one', meths.nvim_eval 'x')
   end)
 
   it('can define insert mode abbreviations with lua callbacks', function()
@@ -1112,10 +1124,10 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     ]]
 
     feed 'iThe foo and the bar and the foo again<esc>'
-    eq('The 1 and the bar and the 2 again', meths.get_current_line())
+    eq('The 1 and the bar and the 2 again', meths.nvim_get_current_line())
 
     feed ':let x = "The foo is the one"<cr>'
-    eq('The foo is the one', meths.eval 'x')
+    eq('The foo is the one', meths.nvim_eval 'x')
   end)
 
   it('can define cmdline mode abbreviations with lua callbacks', function()
@@ -1128,10 +1140,10 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     ]]
 
     feed 'iThe foo and the bar and the foo again<esc>'
-    eq('The foo and the bar and the foo again', meths.get_current_line())
+    eq('The foo and the bar and the foo again', meths.nvim_get_current_line())
 
     feed ':let x = "The foo is the one"<cr>'
-    eq('The 1 is the one', meths.eval 'x')
+    eq('The 1 is the one', meths.nvim_eval 'x')
   end)
 end)
 
@@ -1154,9 +1166,9 @@ describe('nvim_buf_set_keymap, nvim_buf_del_keymap', function()
   local function make_two_buffers(start_from_first)
     command('set hidden')
 
-    local first_buf = meths.call_function('bufnr', { '%' })
+    local first_buf = meths.nvim_call_function('bufnr', { '%' })
     command('new')
-    local second_buf = meths.call_function('bufnr', { '%' })
+    local second_buf = meths.nvim_call_function('bufnr', { '%' })
     neq(second_buf, first_buf) -- sanity check
 
     if start_from_first then
@@ -1254,7 +1266,7 @@ describe('nvim_buf_set_keymap, nvim_buf_del_keymap', function()
 
     feed('aa')
 
-    eq({ 'π<M-π>foo<' }, meths.buf_get_lines(0, 0, -1, false))
+    eq({ 'π<M-π>foo<' }, meths.nvim_buf_get_lines(0, 0, -1, false))
   end)
 
   it('can make lua expr mappings without replacing keycodes', function()
@@ -1264,7 +1276,7 @@ describe('nvim_buf_set_keymap, nvim_buf_del_keymap', function()
 
     feed('iaa<esc>')
 
-    eq({ '<space>' }, meths.buf_get_lines(0, 0, -1, false))
+    eq({ '<space>' }, meths.nvim_buf_get_lines(0, 0, -1, false))
   end)
 
   it('can overwrite lua mappings', function()
diff --git a/test/functional/api/server_notifications_spec.lua b/test/functional/api/server_notifications_spec.lua
index d75bfd5324..3fc7b9986a 100644
--- a/test/functional/api/server_notifications_spec.lua
+++ b/test/functional/api/server_notifications_spec.lua
@@ -47,9 +47,11 @@ describe('notify', function()
     end)
 
     it('does not crash for deeply nested variable', function()
-      meths.set_var('l', {})
+      meths.nvim_set_var('l', {})
       local nest_level = 1000
-      meths.command(('call map(range(%u), "extend(g:, {\'l\': [g:l]})")'):format(nest_level - 1))
+      meths.nvim_command(
+        ('call map(range(%u), "extend(g:, {\'l\': [g:l]})")'):format(nest_level - 1)
+      )
       eval('rpcnotify(' .. channel .. ', "event", g:l)')
       local msg = next_msg()
       eq('notification', msg[1])
@@ -106,7 +108,7 @@ describe('notify', function()
       exec_lua([[ return {pcall(vim.rpcrequest, ..., 'nvim_eval', '1+1')}]], catchan)
     )
     retry(nil, 3000, function()
-      eq({}, meths.get_chan_info(catchan))
+      eq({}, meths.nvim_get_chan_info(catchan))
     end) -- cat be dead :(
   end)
 end)
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua
index 421e0b5c9a..6878ac0218 100644
--- a/test/functional/api/server_requests_spec.lua
+++ b/test/functional/api/server_requests_spec.lua
@@ -244,7 +244,7 @@ describe('server -> client', function()
         \ 'rpc': v:true
         \ }
       ]])
-      meths.set_var('args', {
+      meths.nvim_set_var('args', {
         nvim_prog,
         '-ll',
         'test/functional/api/rpc_fixture.lua',
@@ -296,7 +296,7 @@ describe('server -> client', function()
 
       set_session(server)
       eq(serverpid, funcs.getpid())
-      eq('hello', meths.get_current_line())
+      eq('hello', meths.nvim_get_current_line())
 
       -- method calls work both ways
       funcs.rpcrequest(client_id, 'nvim_set_current_line', 'howdy!')
@@ -304,7 +304,7 @@ describe('server -> client', function()
 
       set_session(client)
       eq(clientpid, funcs.getpid())
-      eq('howdy!', meths.get_current_line())
+      eq('howdy!', meths.nvim_get_current_line())
 
       server:close()
       client:close()
@@ -375,7 +375,7 @@ describe('server -> client', function()
       local id = funcs.sockconnect('pipe', address, { rpc = true })
 
       funcs.rpcrequest(id, 'nvim_set_current_line', 'hello')
-      eq('hello', meths.get_current_line())
+      eq('hello', meths.nvim_get_current_line())
       eq(serverpid, funcs.rpcrequest(id, 'nvim_eval', 'getpid()'))
 
       eq(id, funcs.rpcrequest(id, 'nvim_get_api_info')[1])
diff --git a/test/functional/api/ui_spec.lua b/test/functional/api/ui_spec.lua
index dafbbe550f..e74a35e97e 100644
--- a/test/functional/api/ui_spec.lua
+++ b/test/functional/api/ui_spec.lua
@@ -23,39 +23,39 @@ describe('nvim_ui_attach()', function()
   end)
 
   it('validation', function()
-    eq('No such UI option: foo', pcall_err(meths.ui_attach, 80, 24, { foo = { 'foo' } }))
+    eq('No such UI option: foo', pcall_err(meths.nvim_ui_attach, 80, 24, { foo = { 'foo' } }))
 
     eq(
       "Invalid 'ext_linegrid': expected Boolean, got Array",
-      pcall_err(meths.ui_attach, 80, 24, { ext_linegrid = {} })
+      pcall_err(meths.nvim_ui_attach, 80, 24, { ext_linegrid = {} })
     )
     eq(
       "Invalid 'override': expected Boolean, got Array",
-      pcall_err(meths.ui_attach, 80, 24, { override = {} })
+      pcall_err(meths.nvim_ui_attach, 80, 24, { override = {} })
     )
     eq(
       "Invalid 'rgb': expected Boolean, got Array",
-      pcall_err(meths.ui_attach, 80, 24, { rgb = {} })
+      pcall_err(meths.nvim_ui_attach, 80, 24, { rgb = {} })
     )
     eq(
       "Invalid 'term_name': expected String, got Boolean",
-      pcall_err(meths.ui_attach, 80, 24, { term_name = true })
+      pcall_err(meths.nvim_ui_attach, 80, 24, { term_name = true })
     )
     eq(
       "Invalid 'term_colors': expected Integer, got Boolean",
-      pcall_err(meths.ui_attach, 80, 24, { term_colors = true })
+      pcall_err(meths.nvim_ui_attach, 80, 24, { term_colors = true })
     )
     eq(
       "Invalid 'stdin_fd': expected Integer, got String",
-      pcall_err(meths.ui_attach, 80, 24, { stdin_fd = 'foo' })
+      pcall_err(meths.nvim_ui_attach, 80, 24, { stdin_fd = 'foo' })
     )
     eq(
       "Invalid 'stdin_tty': expected Boolean, got String",
-      pcall_err(meths.ui_attach, 80, 24, { stdin_tty = 'foo' })
+      pcall_err(meths.nvim_ui_attach, 80, 24, { stdin_tty = 'foo' })
     )
     eq(
       "Invalid 'stdout_tty': expected Boolean, got String",
-      pcall_err(meths.ui_attach, 80, 24, { stdout_tty = 'foo' })
+      pcall_err(meths.nvim_ui_attach, 80, 24, { stdout_tty = 'foo' })
     )
 
     eq('UI not attached to channel: 1', pcall_err(request, 'nvim_ui_try_resize', 40, 10))
@@ -117,17 +117,17 @@ it('autocmds VimSuspend/VimResume #22041', function()
   end)
   eq({ 's', 'r', 's' }, eval('g:ev'))
   screen.suspended = false
-  meths.input_mouse('move', '', '', 0, 0, 0)
+  meths.nvim_input_mouse('move', '', '', 0, 0, 0)
   eq({ 's', 'r', 's', 'r' }, eval('g:ev'))
 
   feed('<C-Z><C-Z><C-Z>')
   screen:expect(function()
     eq(true, screen.suspended)
   end)
-  meths.ui_set_focus(false)
+  meths.nvim_ui_set_focus(false)
   eq({ 's', 'r', 's', 'r', 's' }, eval('g:ev'))
   screen.suspended = false
-  meths.ui_set_focus(true)
+  meths.nvim_ui_set_focus(true)
   eq({ 's', 'r', 's', 'r', 's', 'r' }, eval('g:ev'))
 
   command('suspend | suspend | suspend')
diff --git a/test/functional/api/version_spec.lua b/test/functional/api/version_spec.lua
index 41f8fccab9..fefafb8f98 100644
--- a/test/functional/api/version_spec.lua
+++ b/test/functional/api/version_spec.lua
@@ -94,7 +94,7 @@ describe('api metadata', function()
   local old_api = {}
   setup(function()
     clear() -- Ensure a session before requesting api_info.
-    api = meths.get_api_info()[2]
+    api = meths.nvim_get_api_info()[2]
     compat = api.version.api_compatible
     api_level = api.version.api_level
     if api.version.api_prerelease then
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 13b80f4486..3fd1cdab1e 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -70,7 +70,7 @@ describe('API', function()
   end)
 
   it('handles errors in async requests', function()
-    local error_types = meths.get_api_info()[2].error_types
+    local error_types = meths.nvim_get_api_info()[2].error_types
     nvim_async('bogus')
     eq({
       'notification',
@@ -82,7 +82,7 @@ describe('API', function()
   end)
 
   it('failed async request emits nvim_error_event', function()
-    local error_types = meths.get_api_info()[2].error_types
+    local error_types = meths.nvim_get_api_info()[2].error_types
     nvim_async('command', 'bogus')
     eq({
       'notification',
@@ -326,7 +326,7 @@ describe('API', function()
       write_file(fname, 'echo "hello"\n')
       local sourcing_fname = tmpname()
       write_file(sourcing_fname, 'call nvim_exec2("source ' .. fname .. '", {"output": v:false})\n')
-      meths.exec2('set verbose=2', { output = false })
+      meths.nvim_exec2('set verbose=2', { output = false })
       local traceback_output = dedent([[
         line 0: sourcing "%s"
         line 0: sourcing "%s"
@@ -343,7 +343,7 @@ describe('API', function()
       )
       eq(
         { output = traceback_output },
-        meths.exec2(
+        meths.nvim_exec2(
           'call nvim_exec2("source ' .. sourcing_fname .. '", {"output": v:false})',
           { output = true }
         )
@@ -367,7 +367,7 @@ describe('API', function()
       screen:set_default_attr_ids({
         [0] = { bold = true, foreground = Screen.colors.Blue },
       })
-      meths.exec2("echo 'hello'", { output = false })
+      meths.nvim_exec2("echo 'hello'", { output = false })
       screen:expect {
         grid = [[
         ^                                        |
@@ -383,7 +383,7 @@ describe('API', function()
       screen:set_default_attr_ids({
         [0] = { bold = true, foreground = Screen.colors.Blue },
       })
-      meths.exec2("echo 'hello'", { output = true })
+      meths.nvim_exec2("echo 'hello'", { output = true })
       screen:expect {
         grid = [[
         ^                                        |
@@ -694,12 +694,12 @@ describe('API', function()
     end)
 
     it('works', function()
-      meths.set_current_dir('Xtestdir')
+      meths.nvim_set_current_dir('Xtestdir')
       eq(funcs.getcwd(), start_dir .. helpers.get_pathsep() .. 'Xtestdir')
     end)
 
     it('sets previous directory', function()
-      meths.set_current_dir('Xtestdir')
+      meths.nvim_set_current_dir('Xtestdir')
       command('cd -')
       eq(funcs.getcwd(), start_dir)
     end)
@@ -707,48 +707,51 @@ describe('API', function()
 
   describe('nvim_exec_lua', function()
     it('works', function()
-      meths.exec_lua('vim.api.nvim_set_var("test", 3)', {})
-      eq(3, meths.get_var('test'))
+      meths.nvim_exec_lua('vim.api.nvim_set_var("test", 3)', {})
+      eq(3, meths.nvim_get_var('test'))
 
-      eq(17, meths.exec_lua('a, b = ...\nreturn a + b', { 10, 7 }))
+      eq(17, meths.nvim_exec_lua('a, b = ...\nreturn a + b', { 10, 7 }))
 
-      eq(NIL, meths.exec_lua('function xx(a,b)\nreturn a..b\nend', {}))
-      eq('xy', meths.exec_lua('return xx(...)', { 'x', 'y' }))
+      eq(NIL, meths.nvim_exec_lua('function xx(a,b)\nreturn a..b\nend', {}))
+      eq('xy', meths.nvim_exec_lua('return xx(...)', { 'x', 'y' }))
 
       -- Deprecated name: nvim_execute_lua.
-      eq('xy', meths.execute_lua('return xx(...)', { 'x', 'y' }))
+      eq('xy', meths.nvim_execute_lua('return xx(...)', { 'x', 'y' }))
     end)
 
     it('reports errors', function()
       eq(
         [[Error loading lua: [string "<nvim>"]:0: '=' expected near '+']],
-        pcall_err(meths.exec_lua, 'a+*b', {})
+        pcall_err(meths.nvim_exec_lua, 'a+*b', {})
       )
 
       eq(
         [[Error loading lua: [string "<nvim>"]:0: unexpected symbol near '1']],
-        pcall_err(meths.exec_lua, '1+2', {})
+        pcall_err(meths.nvim_exec_lua, '1+2', {})
       )
 
       eq(
         [[Error loading lua: [string "<nvim>"]:0: unexpected symbol]],
-        pcall_err(meths.exec_lua, 'aa=bb\0', {})
+        pcall_err(meths.nvim_exec_lua, 'aa=bb\0', {})
       )
 
-      eq([[attempt to call global 'bork' (a nil value)]], pcall_err(meths.exec_lua, 'bork()', {}))
+      eq(
+        [[attempt to call global 'bork' (a nil value)]],
+        pcall_err(meths.nvim_exec_lua, 'bork()', {})
+      )
 
-      eq('did\nthe\nfail', pcall_err(meths.exec_lua, 'error("did\\nthe\\nfail")', {}))
+      eq('did\nthe\nfail', pcall_err(meths.nvim_exec_lua, 'error("did\\nthe\\nfail")', {}))
     end)
 
     it('uses native float values', function()
-      eq(2.5, meths.exec_lua('return select(1, ...)', { 2.5 }))
-      eq('2.5', meths.exec_lua('return vim.inspect(...)', { 2.5 }))
+      eq(2.5, meths.nvim_exec_lua('return select(1, ...)', { 2.5 }))
+      eq('2.5', meths.nvim_exec_lua('return vim.inspect(...)', { 2.5 }))
 
       -- "special" float values are still accepted as return values.
-      eq(2.5, meths.exec_lua("return vim.api.nvim_eval('2.5')", {}))
+      eq(2.5, meths.nvim_exec_lua("return vim.api.nvim_eval('2.5')", {}))
       eq(
         '{\n  [false] = 2.5,\n  [true] = 3\n}',
-        meths.exec_lua("return vim.inspect(vim.api.nvim_eval('2.5'))", {})
+        meths.nvim_exec_lua("return vim.inspect(vim.api.nvim_eval('2.5'))", {})
       )
     end)
   end)
@@ -760,7 +763,7 @@ describe('API', function()
 
     it('can be overridden', function()
       command('lua vim.notify = function(...) return 42 end')
-      eq(42, meths.exec_lua("return vim.notify('Hello world')", {}))
+      eq(42, meths.nvim_exec_lua("return vim.notify('Hello world')", {}))
       nvim('notify', 'hello world', 4, {})
     end)
   end)
@@ -1368,7 +1371,7 @@ describe('API', function()
 
     it('allows block width', function()
       -- behave consistently with setreg(); support "\022{NUM}" return by getregtype()
-      meths.put({ 'line 1', 'line 2', 'line 3' }, 'l', false, false)
+      meths.nvim_put({ 'line 1', 'line 2', 'line 3' }, 'l', false, false)
       expect([[
         line 1
         line 2
@@ -1376,21 +1379,21 @@ describe('API', function()
         ]])
 
       -- larger width create spaces
-      meths.put({ 'a', 'bc' }, 'b3', false, false)
+      meths.nvim_put({ 'a', 'bc' }, 'b3', false, false)
       expect([[
         a  line 1
         bc line 2
         line 3
         ]])
       -- smaller width is ignored
-      meths.put({ 'xxx', 'yyy' }, '\0221', false, true)
+      meths.nvim_put({ 'xxx', 'yyy' }, '\0221', false, true)
       expect([[
         xxxa  line 1
         yyybc line 2
         line 3
         ]])
-      eq("Invalid 'type': 'bx'", pcall_err(meths.put, { 'xxx', 'yyy' }, 'bx', false, true))
-      eq("Invalid 'type': 'b3x'", pcall_err(meths.put, { 'xxx', 'yyy' }, 'b3x', false, true))
+      eq("Invalid 'type': 'bx'", pcall_err(meths.nvim_put, { 'xxx', 'yyy' }, 'bx', false, true))
+      eq("Invalid 'type': 'b3x'", pcall_err(meths.nvim_put, { 'xxx', 'yyy' }, 'b3x', false, true))
     end)
   end)
 
@@ -1417,8 +1420,8 @@ describe('API', function()
 
   describe('set/get/del variables', function()
     it('validation', function()
-      eq('Key not found: bogus', pcall_err(meths.get_var, 'bogus'))
-      eq('Key not found: bogus', pcall_err(meths.del_var, 'bogus'))
+      eq('Key not found: bogus', pcall_err(meths.nvim_get_var, 'bogus'))
+      eq('Key not found: bogus', pcall_err(meths.nvim_del_var, 'bogus'))
     end)
 
     it('nvim_get_var, nvim_set_var, nvim_del_var', function()
@@ -1426,10 +1429,10 @@ describe('API', function()
       eq({ 1, 2, { ['3'] = 1 } }, nvim('get_var', 'lua'))
       eq({ 1, 2, { ['3'] = 1 } }, nvim('eval', 'g:lua'))
       eq(1, funcs.exists('g:lua'))
-      meths.del_var('lua')
+      meths.nvim_del_var('lua')
       eq(0, funcs.exists('g:lua'))
-      eq('Key not found: lua', pcall_err(meths.del_var, 'lua'))
-      meths.set_var('lua', 1)
+      eq('Key not found: lua', pcall_err(meths.nvim_del_var, 'lua'))
+      meths.nvim_set_var('lua', 1)
 
       -- Empty keys are allowed in Vim dicts (and msgpack).
       nvim('set_var', 'dict_empty_key', { [''] = 'empty key' })
@@ -1437,8 +1440,8 @@ describe('API', function()
 
       -- Set locked g: var.
       command('lockvar lua')
-      eq('Key is locked: lua', pcall_err(meths.del_var, 'lua'))
-      eq('Key is locked: lua', pcall_err(meths.set_var, 'lua', 1))
+      eq('Key is locked: lua', pcall_err(meths.nvim_del_var, 'lua'))
+      eq('Key is locked: lua', pcall_err(meths.nvim_set_var, 'lua', 1))
 
       exec([[
         function Test()
@@ -1448,8 +1451,8 @@ describe('API', function()
         let g:Unknown_func = function('Test')
         let g:Unknown_script_func = function('s:Test')
       ]])
-      eq(NIL, meths.get_var('Unknown_func'))
-      eq(NIL, meths.get_var('Unknown_script_func'))
+      eq(NIL, meths.nvim_get_var('Unknown_func'))
+      eq(NIL, meths.nvim_get_var('Unknown_script_func'))
 
       -- Check if autoload works properly
       local pathsep = helpers.get_pathsep()
@@ -1461,37 +1464,40 @@ describe('API', function()
       write_file(autoload_file, [[let testload#value = 2]])
 
       clear { args_rm = { '-u' }, env = { XDG_CONFIG_HOME = xconfig, XDG_DATA_HOME = xdata } }
-      eq(2, meths.get_var('testload#value'))
+      eq(2, meths.nvim_get_var('testload#value'))
       rmdir('Xhome')
     end)
 
     it('nvim_get_vvar, nvim_set_vvar', function()
       eq('Key is read-only: count', pcall_err(request, 'nvim_set_vvar', 'count', 42))
       eq('Dictionary is locked', pcall_err(request, 'nvim_set_vvar', 'nosuchvar', 42))
-      meths.set_vvar('errmsg', 'set by API')
-      eq('set by API', meths.get_vvar('errmsg'))
-      meths.set_vvar('errmsg', 42)
+      meths.nvim_set_vvar('errmsg', 'set by API')
+      eq('set by API', meths.nvim_get_vvar('errmsg'))
+      meths.nvim_set_vvar('errmsg', 42)
       eq('42', eval('v:errmsg'))
-      meths.set_vvar('oldfiles', { 'one', 'two' })
+      meths.nvim_set_vvar('oldfiles', { 'one', 'two' })
       eq({ 'one', 'two' }, eval('v:oldfiles'))
-      meths.set_vvar('oldfiles', {})
+      meths.nvim_set_vvar('oldfiles', {})
       eq({}, eval('v:oldfiles'))
-      eq('Setting v:oldfiles to value with wrong type', pcall_err(meths.set_vvar, 'oldfiles', 'a'))
+      eq(
+        'Setting v:oldfiles to value with wrong type',
+        pcall_err(meths.nvim_set_vvar, 'oldfiles', 'a')
+      )
       eq({}, eval('v:oldfiles'))
 
       feed('i foo foo foo<Esc>0/foo<CR>')
-      eq({ 1, 1 }, meths.win_get_cursor(0))
+      eq({ 1, 1 }, meths.nvim_win_get_cursor(0))
       eq(1, eval('v:searchforward'))
       feed('n')
-      eq({ 1, 5 }, meths.win_get_cursor(0))
-      meths.set_vvar('searchforward', 0)
+      eq({ 1, 5 }, meths.nvim_win_get_cursor(0))
+      meths.nvim_set_vvar('searchforward', 0)
       eq(0, eval('v:searchforward'))
       feed('n')
-      eq({ 1, 1 }, meths.win_get_cursor(0))
-      meths.set_vvar('searchforward', 1)
+      eq({ 1, 1 }, meths.nvim_win_get_cursor(0))
+      meths.nvim_set_vvar('searchforward', 1)
       eq(1, eval('v:searchforward'))
       feed('n')
-      eq({ 1, 5 }, meths.win_get_cursor(0))
+      eq({ 1, 5 }, meths.nvim_win_get_cursor(0))
 
       local screen = Screen.new(60, 3)
       screen:set_default_attr_ids({
@@ -1507,7 +1513,7 @@ describe('API', function()
                                                                     |
       ]],
       }
-      meths.set_vvar('hlsearch', 0)
+      meths.nvim_set_vvar('hlsearch', 0)
       eq(0, eval('v:hlsearch'))
       screen:expect {
         grid = [[
@@ -1516,7 +1522,7 @@ describe('API', function()
                                                                     |
       ]],
       }
-      meths.set_vvar('hlsearch', 1)
+      meths.nvim_set_vvar('hlsearch', 1)
       eq(1, eval('v:hlsearch'))
       screen:expect {
         grid = [[
@@ -1900,7 +1906,7 @@ describe('API', function()
           1,
         },
         NIL,
-      }, meths.call_atomic(req))
+      }, meths.nvim_call_atomic(req))
       eq({ mode = 'r', blocking = true }, nvim('get_mode'))
     end)
     it('during insert-mode map-pending, returns blocking=true #6166', function()
@@ -2004,24 +2010,24 @@ describe('API', function()
 
     it('does not interrupt Insert mode i_CTRL-O #10035', function()
       feed('iHello World<c-o>')
-      eq({ mode = 'niI', blocking = false }, meths.get_mode()) -- fast event
+      eq({ mode = 'niI', blocking = false }, meths.nvim_get_mode()) -- fast event
       eq(2, eval('1+1')) -- causes K_EVENT key
-      eq({ mode = 'niI', blocking = false }, meths.get_mode()) -- still in ctrl-o mode
+      eq({ mode = 'niI', blocking = false }, meths.nvim_get_mode()) -- still in ctrl-o mode
       feed('dd')
-      eq({ mode = 'i', blocking = false }, meths.get_mode()) -- left ctrl-o mode
+      eq({ mode = 'i', blocking = false }, meths.nvim_get_mode()) -- left ctrl-o mode
       expect('') -- executed the command
     end)
 
     it('does not interrupt Select mode v_CTRL-O #15688', function()
       feed('iHello World<esc>gh<c-o>')
-      eq({ mode = 'vs', blocking = false }, meths.get_mode()) -- fast event
-      eq({ mode = 'vs', blocking = false }, meths.get_mode()) -- again #15288
+      eq({ mode = 'vs', blocking = false }, meths.nvim_get_mode()) -- fast event
+      eq({ mode = 'vs', blocking = false }, meths.nvim_get_mode()) -- again #15288
       eq(2, eval('1+1')) -- causes K_EVENT key
-      eq({ mode = 'vs', blocking = false }, meths.get_mode()) -- still in ctrl-o mode
+      eq({ mode = 'vs', blocking = false }, meths.nvim_get_mode()) -- still in ctrl-o mode
       feed('^')
-      eq({ mode = 's', blocking = false }, meths.get_mode()) -- left ctrl-o mode
+      eq({ mode = 's', blocking = false }, meths.nvim_get_mode()) -- left ctrl-o mode
       feed('h')
-      eq({ mode = 'i', blocking = false }, meths.get_mode()) -- entered insert mode
+      eq({ mode = 'i', blocking = false }, meths.nvim_get_mode()) -- entered insert mode
       expect('h') -- selection is the whole line and is replaced
     end)
 
@@ -2176,13 +2182,13 @@ describe('API', function()
       -- then `return str` in vim_replace_termcodes body will make Neovim free
       -- `str.data` twice: once when freeing arguments, then when freeing return
       -- value.
-      eq('', meths.replace_termcodes('', true, true, true))
+      eq('', meths.nvim_replace_termcodes('', true, true, true))
     end)
 
     -- Not exactly the case, as nvim_replace_termcodes() escapes K_SPECIAL in Unicode
     it('translates the result of keytrans() on string with 0x80 byte back', function()
       local s = 'ff\128\253\097tt'
-      eq(s, meths.replace_termcodes(funcs.keytrans(s), true, true, true))
+      eq(s, meths.nvim_replace_termcodes(funcs.keytrans(s), true, true, true))
     end)
   end)
 
@@ -2244,7 +2250,7 @@ describe('API', function()
           silent! call nvim_out_write("\n")
         redir END
       ]])
-      eq('\naaa\n' .. ('a'):rep(5002) .. '\naaa', meths.get_var('out'))
+      eq('\naaa\n' .. ('a'):rep(5002) .. '\naaa', meths.nvim_get_var('out'))
     end)
 
     it('blank line in message', function()
@@ -2430,18 +2436,18 @@ describe('API', function()
     }
 
     it('returns {} for invalid channel', function()
-      eq({}, meths.get_chan_info(0))
-      eq({}, meths.get_chan_info(-1))
+      eq({}, meths.nvim_get_chan_info(0))
+      eq({}, meths.nvim_get_chan_info(-1))
       -- more preallocated numbers might be added, try something high
-      eq({}, meths.get_chan_info(10))
+      eq({}, meths.nvim_get_chan_info(10))
     end)
 
     it('stream=stdio channel', function()
-      eq({ [1] = testinfo, [2] = stderr }, meths.list_chans())
-      eq(testinfo, meths.get_chan_info(1))
-      eq(stderr, meths.get_chan_info(2))
+      eq({ [1] = testinfo, [2] = stderr }, meths.nvim_list_chans())
+      eq(testinfo, meths.nvim_get_chan_info(1))
+      eq(stderr, meths.nvim_get_chan_info(2))
 
-      meths.set_client_info(
+      meths.nvim_set_client_info(
         'functionaltests',
         { major = 0, minor = 3, patch = 17 },
         'ui',
@@ -2460,9 +2466,9 @@ describe('API', function()
           attributes = { license = 'Apache2' },
         },
       }
-      eq({ info = info }, meths.get_var('info_event'))
-      eq({ [1] = info, [2] = stderr }, meths.list_chans())
-      eq(info, meths.get_chan_info(1))
+      eq({ info = info }, meths.nvim_get_var('info_event'))
+      eq({ [1] = info, [2] = stderr }, meths.nvim_list_chans())
+      eq(info, meths.nvim_get_chan_info(1))
     end)
 
     it('stream=job channel', function()
@@ -2475,9 +2481,9 @@ describe('API', function()
         mode = 'rpc',
         client = {},
       }
-      eq({ info = info }, meths.get_var('opened_event'))
-      eq({ [1] = testinfo, [2] = stderr, [3] = info }, meths.list_chans())
-      eq(info, meths.get_chan_info(3))
+      eq({ info = info }, meths.nvim_get_var('opened_event'))
+      eq({ [1] = testinfo, [2] = stderr, [3] = info }, meths.nvim_list_chans())
+      eq(info, meths.nvim_get_chan_info(3))
       eval(
         'rpcrequest(3, "nvim_set_client_info", "amazing-cat", {}, "remote",'
           .. '{"nvim_command":{"n_args":1}},' -- and so on
@@ -2496,8 +2502,8 @@ describe('API', function()
           attributes = { description = 'The Amazing Cat' },
         },
       }
-      eq({ info = info }, meths.get_var('info_event'))
-      eq({ [1] = testinfo, [2] = stderr, [3] = info }, meths.list_chans())
+      eq({ info = info }, meths.nvim_get_var('info_event'))
+      eq({ [1] = testinfo, [2] = stderr, [3] = info }, meths.nvim_list_chans())
 
       eq(
         "Vim:Error invoking 'nvim_set_current_buf' on channel 3 (amazing-cat):\nWrong type for argument 1 when calling nvim_set_current_buf, expecting Buffer",
@@ -2507,8 +2513,8 @@ describe('API', function()
 
     it('stream=job :terminal channel', function()
       command(':terminal')
-      eq({ id = 1 }, meths.get_current_buf())
-      eq(3, meths.get_option_value('channel', { buf = 1 }))
+      eq({ id = 1 }, meths.nvim_get_current_buf())
+      eq(3, meths.nvim_get_option_value('channel', { buf = 1 }))
 
       local info = {
         stream = 'job',
@@ -2518,15 +2524,15 @@ describe('API', function()
         buffer = 1,
         pty = '?',
       }
-      local event = meths.get_var('opened_event')
+      local event = meths.nvim_get_var('opened_event')
       if not is_os('win') then
         info.pty = event.info.pty
         neq(nil, string.match(info.pty, '^/dev/'))
       end
       eq({ info = info }, event)
       info.buffer = { id = 1 }
-      eq({ [1] = testinfo, [2] = stderr, [3] = info }, meths.list_chans())
-      eq(info, meths.get_chan_info(3))
+      eq({ [1] = testinfo, [2] = stderr, [3] = info }, meths.nvim_list_chans())
+      eq(info, meths.nvim_get_chan_info(3))
 
       -- :terminal with args + running process.
       command('enew')
@@ -2566,13 +2572,13 @@ describe('API', function()
 
   describe('nvim_call_atomic', function()
     it('works', function()
-      meths.buf_set_lines(0, 0, -1, true, { 'first' })
+      meths.nvim_buf_set_lines(0, 0, -1, true, { 'first' })
       local req = {
         { 'nvim_get_current_line', {} },
         { 'nvim_set_current_line', { 'second' } },
       }
-      eq({ { 'first', NIL }, NIL }, meths.call_atomic(req))
-      eq({ 'second' }, meths.buf_get_lines(0, 0, -1, true))
+      eq({ { 'first', NIL }, NIL }, meths.nvim_call_atomic(req))
+      eq({ 'second' }, meths.nvim_buf_get_lines(0, 0, -1, true))
     end)
 
     it('allows multiple return values', function()
@@ -2582,11 +2588,11 @@ describe('API', function()
         { 'nvim_get_var', { 'avar' } },
         { 'nvim_get_var', { 'bvar' } },
       }
-      eq({ { NIL, NIL, true, 'string' }, NIL }, meths.call_atomic(req))
+      eq({ { NIL, NIL, true, 'string' }, NIL }, meths.nvim_call_atomic(req))
     end)
 
     it('is aborted by errors in call', function()
-      local error_types = meths.get_api_info()[2].error_types
+      local error_types = meths.nvim_get_api_info()[2].error_types
       local req = {
         { 'nvim_set_var', { 'one', 1 } },
         { 'nvim_buf_set_lines', {} },
@@ -2599,9 +2605,9 @@ describe('API', function()
           error_types.Exception.id,
           'Wrong number of arguments: expecting 5 but got 0',
         },
-      }, meths.call_atomic(req))
-      eq(1, meths.get_var('one'))
-      eq(false, pcall(meths.get_var, 'two'))
+      }, meths.nvim_call_atomic(req))
+      eq(1, meths.nvim_get_var('one'))
+      eq(false, pcall(meths.nvim_get_var, 'two'))
 
       -- still returns all previous successful calls
       req = {
@@ -2613,7 +2619,7 @@ describe('API', function()
       }
       eq(
         { { NIL, NIL, 5 }, { 3, error_types.Validation.id, 'Index out of bounds' } },
-        meths.call_atomic(req)
+        meths.nvim_call_atomic(req)
       )
 
       req = {
@@ -2622,9 +2628,9 @@ describe('API', function()
       }
       eq(
         { {}, { 0, error_types.Exception.id, 'Invalid method: i_am_not_a_method' } },
-        meths.call_atomic(req)
+        meths.nvim_call_atomic(req)
       )
-      eq(5, meths.get_var('avar'))
+      eq(5, meths.nvim_get_var('avar'))
     end)
 
     it('validation', function()
@@ -2633,25 +2639,28 @@ describe('API', function()
         { 'nvim_set_var' },
         { 'nvim_set_var', { 'avar', 2 } },
       }
-      eq("Invalid 'calls' item: expected 2-item Array", pcall_err(meths.call_atomic, req))
+      eq("Invalid 'calls' item: expected 2-item Array", pcall_err(meths.nvim_call_atomic, req))
       -- call before was done, but not after
-      eq(1, meths.get_var('avar'))
+      eq(1, meths.nvim_get_var('avar'))
 
       req = {
         { 'nvim_set_var', { 'bvar', { 2, 3 } } },
         12,
       }
-      eq("Invalid 'calls' item: expected Array, got Integer", pcall_err(meths.call_atomic, req))
-      eq({ 2, 3 }, meths.get_var('bvar'))
+      eq(
+        "Invalid 'calls' item: expected Array, got Integer",
+        pcall_err(meths.nvim_call_atomic, req)
+      )
+      eq({ 2, 3 }, meths.nvim_get_var('bvar'))
 
       req = {
         { 'nvim_set_current_line', 'little line' },
         { 'nvim_set_var', { 'avar', 3 } },
       }
-      eq('Invalid call args: expected Array, got String', pcall_err(meths.call_atomic, req))
+      eq('Invalid call args: expected Array, got String', pcall_err(meths.nvim_call_atomic, req))
       -- call before was done, but not after
-      eq(1, meths.get_var('avar'))
-      eq({ '' }, meths.buf_get_lines(0, 0, -1, true))
+      eq(1, meths.nvim_get_var('avar'))
+      eq({ '' }, meths.nvim_buf_get_lines(0, 0, -1, true))
     end)
   end)
 
@@ -2665,36 +2674,36 @@ describe('API', function()
       rmdir 'Xtest'
     end)
     before_each(function()
-      meths.set_current_dir 'Xtest'
+      meths.nvim_set_current_dir 'Xtest'
     end)
 
     it('returns nothing with empty &runtimepath', function()
-      meths.set_option_value('runtimepath', '', {})
-      eq({}, meths.list_runtime_paths())
+      meths.nvim_set_option_value('runtimepath', '', {})
+      eq({}, meths.nvim_list_runtime_paths())
     end)
     it('returns single runtimepath', function()
-      meths.set_option_value('runtimepath', 'a', {})
-      eq({ 'a' }, meths.list_runtime_paths())
+      meths.nvim_set_option_value('runtimepath', 'a', {})
+      eq({ 'a' }, meths.nvim_list_runtime_paths())
     end)
     it('returns two runtimepaths', function()
-      meths.set_option_value('runtimepath', 'a,b', {})
-      eq({ 'a', 'b' }, meths.list_runtime_paths())
+      meths.nvim_set_option_value('runtimepath', 'a,b', {})
+      eq({ 'a', 'b' }, meths.nvim_list_runtime_paths())
     end)
     it('returns empty strings when appropriate', function()
-      meths.set_option_value('runtimepath', 'a,,b', {})
-      eq({ 'a', '', 'b' }, meths.list_runtime_paths())
-      meths.set_option_value('runtimepath', ',a,b', {})
-      eq({ '', 'a', 'b' }, meths.list_runtime_paths())
+      meths.nvim_set_option_value('runtimepath', 'a,,b', {})
+      eq({ 'a', '', 'b' }, meths.nvim_list_runtime_paths())
+      meths.nvim_set_option_value('runtimepath', ',a,b', {})
+      eq({ '', 'a', 'b' }, meths.nvim_list_runtime_paths())
       -- Trailing "," is ignored. Use ",," if you really really want CWD.
-      meths.set_option_value('runtimepath', 'a,b,', {})
-      eq({ 'a', 'b' }, meths.list_runtime_paths())
-      meths.set_option_value('runtimepath', 'a,b,,', {})
-      eq({ 'a', 'b', '' }, meths.list_runtime_paths())
+      meths.nvim_set_option_value('runtimepath', 'a,b,', {})
+      eq({ 'a', 'b' }, meths.nvim_list_runtime_paths())
+      meths.nvim_set_option_value('runtimepath', 'a,b,,', {})
+      eq({ 'a', 'b', '' }, meths.nvim_list_runtime_paths())
     end)
     it('truncates too long paths', function()
       local long_path = ('/a'):rep(8192)
-      meths.set_option_value('runtimepath', long_path, {})
-      local paths_list = meths.list_runtime_paths()
+      meths.nvim_set_option_value('runtimepath', long_path, {})
+      local paths_list = meths.nvim_list_runtime_paths()
       eq({}, paths_list)
     end)
   end)
@@ -2723,7 +2732,7 @@ describe('API', function()
 
   describe('nvim_parse_expression', function()
     before_each(function()
-      meths.set_option_value('isident', '', {})
+      meths.nvim_set_option_value('isident', '', {})
     end)
 
     local function simplify_east_api_node(line, east_api_node)
@@ -2856,7 +2865,7 @@ describe('API', function()
       nz_flags_exps = nz_flags_exps or {}
       for _, flags in ipairs(opts.flags) do
         local err, msg = pcall(function()
-          local east_api = meths.parse_expression(str, FLAGS_TO_STR[flags], true)
+          local east_api = meths.nvim_parse_expression(str, FLAGS_TO_STR[flags], true)
           local east_hl = east_api.highlight
           east_api.highlight = nil
           local ast = simplify_east_api(str, east_api)
@@ -2980,33 +2989,33 @@ describe('API', function()
 
   describe('nvim_create_namespace', function()
     it('works', function()
-      eq({}, meths.get_namespaces())
-      eq(1, meths.create_namespace('ns-1'))
-      eq(2, meths.create_namespace('ns-2'))
-      eq(1, meths.create_namespace('ns-1'))
-      eq({ ['ns-1'] = 1, ['ns-2'] = 2 }, meths.get_namespaces())
-      eq(3, meths.create_namespace(''))
-      eq(4, meths.create_namespace(''))
-      eq({ ['ns-1'] = 1, ['ns-2'] = 2 }, meths.get_namespaces())
+      eq({}, meths.nvim_get_namespaces())
+      eq(1, meths.nvim_create_namespace('ns-1'))
+      eq(2, meths.nvim_create_namespace('ns-2'))
+      eq(1, meths.nvim_create_namespace('ns-1'))
+      eq({ ['ns-1'] = 1, ['ns-2'] = 2 }, meths.nvim_get_namespaces())
+      eq(3, meths.nvim_create_namespace(''))
+      eq(4, meths.nvim_create_namespace(''))
+      eq({ ['ns-1'] = 1, ['ns-2'] = 2 }, meths.nvim_get_namespaces())
     end)
   end)
 
   describe('nvim_create_buf', function()
     it('works', function()
-      eq({ id = 2 }, meths.create_buf(true, false))
-      eq({ id = 3 }, meths.create_buf(false, false))
+      eq({ id = 2 }, meths.nvim_create_buf(true, false))
+      eq({ id = 3 }, meths.nvim_create_buf(false, false))
       eq(
         '  1 %a   "[No Name]"                    line 1\n'
           .. '  2  h   "[No Name]"                    line 0',
-        meths.command_output('ls')
+        meths.nvim_command_output('ls')
       )
       -- current buffer didn't change
-      eq({ id = 1 }, meths.get_current_buf())
+      eq({ id = 1 }, meths.nvim_get_current_buf())
 
       local screen = Screen.new(20, 4)
       screen:attach()
-      meths.buf_set_lines(2, 0, -1, true, { 'some text' })
-      meths.set_current_buf(2)
+      meths.nvim_buf_set_lines(2, 0, -1, true, { 'some text' })
+      meths.nvim_set_current_buf(2)
       screen:expect(
         [[
         ^some text           |
@@ -3020,43 +3029,43 @@ describe('API', function()
     end)
 
     it('can change buftype before visiting', function()
-      meths.set_option_value('hidden', false, {})
-      eq({ id = 2 }, meths.create_buf(true, false))
-      meths.set_option_value('buftype', 'nofile', { buf = 2 })
-      meths.buf_set_lines(2, 0, -1, true, { 'test text' })
+      meths.nvim_set_option_value('hidden', false, {})
+      eq({ id = 2 }, meths.nvim_create_buf(true, false))
+      meths.nvim_set_option_value('buftype', 'nofile', { buf = 2 })
+      meths.nvim_buf_set_lines(2, 0, -1, true, { 'test text' })
       command('split | buffer 2')
-      eq({ id = 2 }, meths.get_current_buf())
+      eq({ id = 2 }, meths.nvim_get_current_buf())
       -- if the buf_set_option("buftype") didn't work, this would error out.
       command('close')
-      eq({ id = 1 }, meths.get_current_buf())
+      eq({ id = 1 }, meths.nvim_get_current_buf())
     end)
 
     it('does not trigger BufEnter, BufWinEnter', function()
       command('let g:fired = v:false')
       command('au BufEnter,BufWinEnter * let g:fired = v:true')
 
-      eq({ id = 2 }, meths.create_buf(true, false))
-      meths.buf_set_lines(2, 0, -1, true, { 'test', 'text' })
+      eq({ id = 2 }, meths.nvim_create_buf(true, false))
+      meths.nvim_buf_set_lines(2, 0, -1, true, { 'test', 'text' })
 
       eq(false, eval('g:fired'))
     end)
 
     it('TextChanged and TextChangedI do not trigger without changes', function()
-      local buf = meths.create_buf(true, false)
+      local buf = meths.nvim_create_buf(true, false)
       command([[let g:changed = '']])
-      meths.create_autocmd({ 'TextChanged', 'TextChangedI' }, {
+      meths.nvim_create_autocmd({ 'TextChanged', 'TextChangedI' }, {
         buffer = buf,
         command = 'let g:changed ..= mode()',
       })
-      meths.set_current_buf(buf)
+      meths.nvim_set_current_buf(buf)
       feed('i')
-      eq('', meths.get_var('changed'))
+      eq('', meths.nvim_get_var('changed'))
     end)
 
     it('scratch-buffer', function()
-      eq({ id = 2 }, meths.create_buf(false, true))
-      eq({ id = 3 }, meths.create_buf(true, true))
-      eq({ id = 4 }, meths.create_buf(true, true))
+      eq({ id = 2 }, meths.nvim_create_buf(false, true))
+      eq({ id = 3 }, meths.nvim_create_buf(true, true))
+      eq({ id = 4 }, meths.nvim_create_buf(true, true))
       local scratch_bufs = { 2, 3, 4 }
       eq(
         '  1 %a   "[No Name]"                    line 1\n'
@@ -3065,7 +3074,7 @@ describe('API', function()
         exec_capture('ls')
       )
       -- current buffer didn't change
-      eq({ id = 1 }, meths.get_current_buf())
+      eq({ id = 1 }, meths.nvim_get_current_buf())
 
       local screen = Screen.new(20, 4)
       screen:set_default_attr_ids({
@@ -3077,27 +3086,27 @@ describe('API', function()
       -- Editing a scratch-buffer does NOT change its properties.
       --
       local edited_buf = 2
-      meths.buf_set_lines(edited_buf, 0, -1, true, { 'some text' })
+      meths.nvim_buf_set_lines(edited_buf, 0, -1, true, { 'some text' })
       for _, b in ipairs(scratch_bufs) do
-        eq('nofile', meths.get_option_value('buftype', { buf = b }))
-        eq('hide', meths.get_option_value('bufhidden', { buf = b }))
-        eq(false, meths.get_option_value('swapfile', { buf = b }))
-        eq(false, meths.get_option_value('modeline', { buf = b }))
+        eq('nofile', meths.nvim_get_option_value('buftype', { buf = b }))
+        eq('hide', meths.nvim_get_option_value('bufhidden', { buf = b }))
+        eq(false, meths.nvim_get_option_value('swapfile', { buf = b }))
+        eq(false, meths.nvim_get_option_value('modeline', { buf = b }))
       end
 
       --
       -- Visiting a scratch-buffer DOES NOT change its properties.
       --
-      meths.set_current_buf(edited_buf)
+      meths.nvim_set_current_buf(edited_buf)
       screen:expect([[
         ^some text           |
         {1:~                   }|*2
                             |
       ]])
-      eq('nofile', meths.get_option_value('buftype', { buf = edited_buf }))
-      eq('hide', meths.get_option_value('bufhidden', { buf = edited_buf }))
-      eq(false, meths.get_option_value('swapfile', { buf = edited_buf }))
-      eq(false, meths.get_option_value('modeline', { buf = edited_buf }))
+      eq('nofile', meths.nvim_get_option_value('buftype', { buf = edited_buf }))
+      eq('hide', meths.nvim_get_option_value('bufhidden', { buf = edited_buf }))
+      eq(false, meths.nvim_get_option_value('swapfile', { buf = edited_buf }))
+      eq(false, meths.nvim_get_option_value('modeline', { buf = edited_buf }))
 
       -- Scratch buffer can be wiped without error.
       command('bwipe')
@@ -3119,11 +3128,11 @@ describe('API', function()
   describe('nvim_get_runtime_file', function()
     local p = helpers.alter_slashes
     it('can find files', function()
-      eq({}, meths.get_runtime_file('bork.borkbork', false))
-      eq({}, meths.get_runtime_file('bork.borkbork', true))
-      eq(1, #meths.get_runtime_file('autoload/msgpack.vim', false))
-      eq(1, #meths.get_runtime_file('autoload/msgpack.vim', true))
-      local val = meths.get_runtime_file('autoload/remote/*.vim', true)
+      eq({}, meths.nvim_get_runtime_file('bork.borkbork', false))
+      eq({}, meths.nvim_get_runtime_file('bork.borkbork', true))
+      eq(1, #meths.nvim_get_runtime_file('autoload/msgpack.vim', false))
+      eq(1, #meths.nvim_get_runtime_file('autoload/msgpack.vim', true))
+      local val = meths.nvim_get_runtime_file('autoload/remote/*.vim', true)
       eq(2, #val)
       if endswith(val[1], 'define.vim') then
         ok(endswith(val[1], p 'autoload/remote/define.vim'))
@@ -3132,37 +3141,37 @@ describe('API', function()
         ok(endswith(val[1], p 'autoload/remote/host.vim'))
         ok(endswith(val[2], p 'autoload/remote/define.vim'))
       end
-      val = meths.get_runtime_file('autoload/remote/*.vim', false)
+      val = meths.nvim_get_runtime_file('autoload/remote/*.vim', false)
       eq(1, #val)
       ok(
         endswith(val[1], p 'autoload/remote/define.vim')
           or endswith(val[1], p 'autoload/remote/host.vim')
       )
 
-      val = meths.get_runtime_file('lua', true)
+      val = meths.nvim_get_runtime_file('lua', true)
       eq(1, #val)
       ok(endswith(val[1], p 'lua'))
 
-      val = meths.get_runtime_file('lua/vim', true)
+      val = meths.nvim_get_runtime_file('lua/vim', true)
       eq(1, #val)
       ok(endswith(val[1], p 'lua/vim'))
     end)
 
     it('can find directories', function()
-      local val = meths.get_runtime_file('lua/', true)
+      local val = meths.nvim_get_runtime_file('lua/', true)
       eq(1, #val)
       ok(endswith(val[1], p 'lua/'))
 
-      val = meths.get_runtime_file('lua/vim/', true)
+      val = meths.nvim_get_runtime_file('lua/vim/', true)
       eq(1, #val)
       ok(endswith(val[1], p 'lua/vim/'))
 
-      eq({}, meths.get_runtime_file('foobarlang/', true))
+      eq({}, meths.nvim_get_runtime_file('foobarlang/', true))
     end)
     it('can handle bad patterns', function()
       skip(is_os('win'))
 
-      eq('Vim:E220: Missing }.', pcall_err(meths.get_runtime_file, '{', false))
+      eq('Vim:E220: Missing }.', pcall_err(meths.nvim_get_runtime_file, '{', false))
 
       eq(
         'Vim(echo):E5555: API call: Vim:E220: Missing }.',
@@ -3173,25 +3182,25 @@ describe('API', function()
 
   describe('nvim_get_all_options_info', function()
     it('should have key value pairs of option names', function()
-      local options_info = meths.get_all_options_info()
+      local options_info = meths.nvim_get_all_options_info()
       neq(nil, options_info.listchars)
       neq(nil, options_info.tabstop)
 
-      eq(meths.get_option_info 'winhighlight', options_info.winhighlight)
+      eq(meths.nvim_get_option_info 'winhighlight', options_info.winhighlight)
     end)
 
     it('should not crash when echoed', function()
-      meths.exec2('echo nvim_get_all_options_info()', { output = true })
+      meths.nvim_exec2('echo nvim_get_all_options_info()', { output = true })
     end)
   end)
 
   describe('nvim_get_option_info', function()
     it('should error for unknown options', function()
-      eq("Invalid option (not found): 'bogus'", pcall_err(meths.get_option_info, 'bogus'))
+      eq("Invalid option (not found): 'bogus'", pcall_err(meths.nvim_get_option_info, 'bogus'))
     end)
 
     it('should return the same options for short and long name', function()
-      eq(meths.get_option_info 'winhl', meths.get_option_info 'winhighlight')
+      eq(meths.nvim_get_option_info 'winhl', meths.nvim_get_option_info 'winhighlight')
     end)
 
     it('should have information about window options', function()
@@ -3209,7 +3218,7 @@ describe('API', function()
         shortname = 'winhl',
         type = 'string',
         was_set = false,
-      }, meths.get_option_info 'winhl')
+      }, meths.nvim_get_option_info 'winhl')
     end)
 
     it('should have information about buffer options', function()
@@ -3227,13 +3236,13 @@ describe('API', function()
         shortname = 'ft',
         type = 'string',
         was_set = false,
-      }, meths.get_option_info 'filetype')
+      }, meths.nvim_get_option_info 'filetype')
     end)
 
     it('should have information about global options', function()
       -- precondition: the option was changed from its default
       -- in test setup.
-      eq(false, meths.get_option_value('showcmd', {}))
+      eq(false, meths.nvim_get_option_value('showcmd', {}))
 
       eq({
         allows_duplicates = true,
@@ -3249,9 +3258,9 @@ describe('API', function()
         shortname = 'sc',
         type = 'boolean',
         was_set = true,
-      }, meths.get_option_info 'showcmd')
+      }, meths.nvim_get_option_info 'showcmd')
 
-      meths.set_option_value('showcmd', true, {})
+      meths.nvim_set_option_value('showcmd', true, {})
 
       eq({
         allows_duplicates = true,
@@ -3267,7 +3276,7 @@ describe('API', function()
         shortname = 'sc',
         type = 'boolean',
         was_set = true,
-      }, meths.get_option_info 'showcmd')
+      }, meths.nvim_get_option_info 'showcmd')
     end)
   end)
 
@@ -3294,18 +3303,18 @@ describe('API', function()
       )
 
       exec_lua 'vim.cmd.vsplit()'
-      meths.create_buf(false, false)
+      meths.nvim_create_buf(false, false)
 
-      bufs = meths.list_bufs()
-      wins = meths.list_wins()
+      bufs = meths.nvim_list_bufs()
+      wins = meths.nvim_list_wins()
 
-      meths.win_set_buf(wins[1].id, bufs[1].id)
-      meths.win_set_buf(wins[2].id, bufs[2].id)
+      meths.nvim_win_set_buf(wins[1].id, bufs[1].id)
+      meths.nvim_win_set_buf(wins[2].id, bufs[2].id)
 
-      meths.set_current_win(wins[2].id)
-      meths.exec('source ' .. fname, false)
+      meths.nvim_set_current_win(wins[2].id)
+      meths.nvim_exec('source ' .. fname, false)
 
-      meths.set_current_win(wins[1].id)
+      meths.nvim_set_current_win(wins[1].id)
     end)
 
     after_each(function()
@@ -3313,9 +3322,9 @@ describe('API', function()
     end)
 
     it('should return option information', function()
-      eq(meths.get_option_info('dictionary'), meths.get_option_info2('dictionary', {})) -- buffer
-      eq(meths.get_option_info('fillchars'), meths.get_option_info2('fillchars', {})) -- window
-      eq(meths.get_option_info('completeopt'), meths.get_option_info2('completeopt', {})) -- global
+      eq(meths.nvim_get_option_info('dictionary'), meths.nvim_get_option_info2('dictionary', {})) -- buffer
+      eq(meths.nvim_get_option_info('fillchars'), meths.nvim_get_option_info2('fillchars', {})) -- window
+      eq(meths.nvim_get_option_info('completeopt'), meths.nvim_get_option_info2('completeopt', {})) -- global
     end)
 
     describe('last set', function()
@@ -3347,21 +3356,21 @@ describe('API', function()
       for _, t in pairs(tests) do
         it(t.desc, function()
           -- Switch to the target buffer/window so that curbuf/curwin are used.
-          meths.set_current_win(wins[2].id)
-          local info = meths.get_option_info2(unpack(t.args))
+          meths.nvim_set_current_win(wins[2].id)
+          local info = meths.nvim_get_option_info2(unpack(t.args))
           eq(t.linenr, info.last_set_linenr)
           eq(t.sid, info.last_set_sid)
         end)
       end
 
       it('is provided for cross-buffer requests', function()
-        local info = meths.get_option_info2('formatprg', { buf = bufs[2].id })
+        local info = meths.nvim_get_option_info2('formatprg', { buf = bufs[2].id })
         eq(2, info.last_set_linenr)
         eq(1, info.last_set_sid)
       end)
 
       it('is provided for cross-window requests', function()
-        local info = meths.get_option_info2('listchars', { win = wins[2].id })
+        local info = meths.nvim_get_option_info2('listchars', { win = wins[2].id })
         eq(6, info.last_set_linenr)
         eq(1, info.last_set_sid)
       end)
@@ -3466,11 +3475,15 @@ describe('API', function()
     end)
 
     it('can batch process sequences', function()
-      local b = meths.create_buf(true, true)
-      meths.open_win(b, false, { width = 79, height = 31, row = 1, col = 1, relative = 'editor' })
-      local t = meths.open_term(b, {})
+      local b = meths.nvim_create_buf(true, true)
+      meths.nvim_open_win(
+        b,
+        false,
+        { width = 79, height = 31, row = 1, col = 1, relative = 'editor' }
+      )
+      local t = meths.nvim_open_term(b, {})
 
-      meths.chan_send(t, io.open('test/functional/fixtures/smile2.cat', 'r'):read('*a'))
+      meths.nvim_chan_send(t, io.open('test/functional/fixtures/smile2.cat', 'r'):read('*a'))
       screen:expect {
         grid = [[
         ^                                                                                                    |
@@ -3576,50 +3589,56 @@ describe('API', function()
 
   describe('nvim_del_mark', function()
     it('works', function()
-      local buf = meths.create_buf(false, true)
-      meths.buf_set_lines(buf, -1, -1, true, { 'a', 'bit of', 'text' })
-      eq(true, meths.buf_set_mark(buf, 'F', 2, 2, {}))
-      eq(true, meths.del_mark('F'))
-      eq({ 0, 0 }, meths.buf_get_mark(buf, 'F'))
+      local buf = meths.nvim_create_buf(false, true)
+      meths.nvim_buf_set_lines(buf, -1, -1, true, { 'a', 'bit of', 'text' })
+      eq(true, meths.nvim_buf_set_mark(buf, 'F', 2, 2, {}))
+      eq(true, meths.nvim_del_mark('F'))
+      eq({ 0, 0 }, meths.nvim_buf_get_mark(buf, 'F'))
     end)
     it('validation', function()
-      eq("Invalid mark name (must be file/uppercase): 'f'", pcall_err(meths.del_mark, 'f'))
-      eq("Invalid mark name (must be file/uppercase): '!'", pcall_err(meths.del_mark, '!'))
-      eq("Invalid mark name (must be a single char): 'fail'", pcall_err(meths.del_mark, 'fail'))
+      eq("Invalid mark name (must be file/uppercase): 'f'", pcall_err(meths.nvim_del_mark, 'f'))
+      eq("Invalid mark name (must be file/uppercase): '!'", pcall_err(meths.nvim_del_mark, '!'))
+      eq(
+        "Invalid mark name (must be a single char): 'fail'",
+        pcall_err(meths.nvim_del_mark, 'fail')
+      )
     end)
   end)
   describe('nvim_get_mark', function()
     it('works', function()
-      local buf = meths.create_buf(false, true)
-      meths.buf_set_lines(buf, -1, -1, true, { 'a', 'bit of', 'text' })
-      meths.buf_set_mark(buf, 'F', 2, 2, {})
-      meths.buf_set_name(buf, 'mybuf')
-      local mark = meths.get_mark('F', {})
+      local buf = meths.nvim_create_buf(false, true)
+      meths.nvim_buf_set_lines(buf, -1, -1, true, { 'a', 'bit of', 'text' })
+      meths.nvim_buf_set_mark(buf, 'F', 2, 2, {})
+      meths.nvim_buf_set_name(buf, 'mybuf')
+      local mark = meths.nvim_get_mark('F', {})
       -- Compare the path tail only
       assert(string.find(mark[4], 'mybuf$'))
       eq({ 2, 2, buf.id, mark[4] }, mark)
     end)
     it('validation', function()
-      eq("Invalid mark name (must be file/uppercase): 'f'", pcall_err(meths.get_mark, 'f', {}))
-      eq("Invalid mark name (must be file/uppercase): '!'", pcall_err(meths.get_mark, '!', {}))
-      eq("Invalid mark name (must be a single char): 'fail'", pcall_err(meths.get_mark, 'fail', {}))
+      eq("Invalid mark name (must be file/uppercase): 'f'", pcall_err(meths.nvim_get_mark, 'f', {}))
+      eq("Invalid mark name (must be file/uppercase): '!'", pcall_err(meths.nvim_get_mark, '!', {}))
+      eq(
+        "Invalid mark name (must be a single char): 'fail'",
+        pcall_err(meths.nvim_get_mark, 'fail', {})
+      )
     end)
     it('returns the expected when mark is not set', function()
-      eq(true, meths.del_mark('A'))
-      eq({ 0, 0, 0, '' }, meths.get_mark('A', {}))
+      eq(true, meths.nvim_del_mark('A'))
+      eq({ 0, 0, 0, '' }, meths.nvim_get_mark('A', {}))
     end)
     it('works with deleted buffers', function()
       local fname = tmpname()
       write_file(fname, 'a\nbit of\text')
       nvim('command', 'edit ' .. fname)
-      local buf = meths.get_current_buf()
+      local buf = meths.nvim_get_current_buf()
 
-      meths.buf_set_mark(buf, 'F', 2, 2, {})
+      meths.nvim_buf_set_mark(buf, 'F', 2, 2, {})
       nvim('command', 'new') -- Create new buf to avoid :bd failing
       nvim('command', 'bd! ' .. buf.id)
       os.remove(fname)
 
-      local mark = meths.get_mark('F', {})
+      local mark = meths.nvim_get_mark('F', {})
       -- To avoid comparing relative vs absolute path
       local mfname = mark[4]
       local tail_patt = [[[\/][^\/]*$]]
@@ -3633,72 +3652,72 @@ describe('API', function()
       eq({
         str = '%StatusLineStringWithHighlights',
         width = 31,
-      }, meths.eval_statusline('%%StatusLineString%#WarningMsg#WithHighlights', {}))
+      }, meths.nvim_eval_statusline('%%StatusLineString%#WarningMsg#WithHighlights', {}))
     end)
     it("doesn't exceed maxwidth", function()
       eq({
         str = 'Should be trun>',
         width = 15,
-      }, meths.eval_statusline('Should be truncated%<', { maxwidth = 15 }))
+      }, meths.nvim_eval_statusline('Should be truncated%<', { maxwidth = 15 }))
     end)
     it('supports ASCII fillchar', function()
       eq(
         { str = 'a~~~b', width = 5 },
-        meths.eval_statusline('a%=b', { fillchar = '~', maxwidth = 5 })
+        meths.nvim_eval_statusline('a%=b', { fillchar = '~', maxwidth = 5 })
       )
     end)
     it('supports single-width multibyte fillchar', function()
       eq(
         { str = 'a━━━b', width = 5 },
-        meths.eval_statusline('a%=b', { fillchar = '━', maxwidth = 5 })
+        meths.nvim_eval_statusline('a%=b', { fillchar = '━', maxwidth = 5 })
       )
     end)
     it('treats double-width fillchar as single-width', function()
       eq(
         { str = 'a哦哦哦b', width = 5 },
-        meths.eval_statusline('a%=b', { fillchar = '哦', maxwidth = 5 })
+        meths.nvim_eval_statusline('a%=b', { fillchar = '哦', maxwidth = 5 })
       )
     end)
     it('treats control character fillchar as single-width', function()
       eq(
         { str = 'a\031\031\031b', width = 5 },
-        meths.eval_statusline('a%=b', { fillchar = '\031', maxwidth = 5 })
+        meths.nvim_eval_statusline('a%=b', { fillchar = '\031', maxwidth = 5 })
       )
     end)
     it('rejects multiple-character fillchar', function()
       eq(
         "Invalid 'fillchar': expected single character",
-        pcall_err(meths.eval_statusline, '', { fillchar = 'aa' })
+        pcall_err(meths.nvim_eval_statusline, '', { fillchar = 'aa' })
       )
     end)
     it('rejects empty string fillchar', function()
       eq(
         "Invalid 'fillchar': expected single character",
-        pcall_err(meths.eval_statusline, '', { fillchar = '' })
+        pcall_err(meths.nvim_eval_statusline, '', { fillchar = '' })
       )
     end)
     it('rejects non-string fillchar', function()
       eq(
         "Invalid 'fillchar': expected String, got Integer",
-        pcall_err(meths.eval_statusline, '', { fillchar = 1 })
+        pcall_err(meths.nvim_eval_statusline, '', { fillchar = 1 })
       )
     end)
     it('rejects invalid string', function()
-      eq('E539: Illegal character <}>', pcall_err(meths.eval_statusline, '%{%}', {}))
+      eq('E539: Illegal character <}>', pcall_err(meths.nvim_eval_statusline, '%{%}', {}))
     end)
     it('supports various items', function()
-      eq({ str = '0', width = 1 }, meths.eval_statusline('%l', { maxwidth = 5 }))
+      eq({ str = '0', width = 1 }, meths.nvim_eval_statusline('%l', { maxwidth = 5 }))
       command('set readonly')
-      eq({ str = '[RO]', width = 4 }, meths.eval_statusline('%r', { maxwidth = 5 }))
+      eq({ str = '[RO]', width = 4 }, meths.nvim_eval_statusline('%r', { maxwidth = 5 }))
       local screen = Screen.new(80, 24)
       screen:attach()
       command('set showcmd')
       feed('1234')
       screen:expect({ any = '1234' })
-      eq({ str = '1234', width = 4 }, meths.eval_statusline('%S', { maxwidth = 5 }))
+      eq({ str = '1234', width = 4 }, meths.nvim_eval_statusline('%S', { maxwidth = 5 }))
       feed('56')
       screen:expect({ any = '123456' })
-      eq({ str = '<3456', width = 5 }, meths.eval_statusline('%S', { maxwidth = 5 }))
+      eq({ str = '<3456', width = 5 }, meths.nvim_eval_statusline('%S', { maxwidth = 5 }))
     end)
     describe('highlight parsing', function()
       it('works', function()
@@ -3711,7 +3730,7 @@ describe('API', function()
               { start = 24, group = 'User1' },
             },
           },
-          meths.eval_statusline(
+          meths.nvim_eval_statusline(
             '%#WarningMsg#TextWithWarningHighlight%1*TextWithUserHighlight',
             { highlights = true }
           )
@@ -3724,7 +3743,7 @@ describe('API', function()
           highlights = {
             { start = 0, group = 'StatusLine' },
           },
-        }, meths.eval_statusline('TextWithNoHighlight', { highlights = true }))
+        }, meths.nvim_eval_statusline('TextWithNoHighlight', { highlights = true }))
       end)
       it('works with inactive statusline', function()
         command('split')
@@ -3738,9 +3757,9 @@ describe('API', function()
               { start = 19, group = 'WarningMsg' },
             },
           },
-          meths.eval_statusline(
+          meths.nvim_eval_statusline(
             'TextWithNoHighlight%#WarningMsg#TextWithWarningHighlight',
-            { winid = meths.list_wins()[2].id, highlights = true }
+            { winid = meths.nvim_list_wins()[2].id, highlights = true }
           )
         )
       end)
@@ -3754,7 +3773,7 @@ describe('API', function()
               { start = 19, group = 'WarningMsg' },
             },
           },
-          meths.eval_statusline(
+          meths.nvim_eval_statusline(
             'TextWithNoHighlight%#WarningMsg#TextWithWarningHighlight',
             { use_tabline = true, highlights = true }
           )
@@ -3770,7 +3789,7 @@ describe('API', function()
               { start = 19, group = 'WarningMsg' },
             },
           },
-          meths.eval_statusline(
+          meths.nvim_eval_statusline(
             'TextWithNoHighlight%#WarningMsg#TextWithWarningHighlight',
             { use_winbar = true, highlights = true }
           )
@@ -3798,25 +3817,31 @@ describe('API', function()
             { group = 'ErrorMsg', start = 8 },
             { group = 'Normal', start = 10 },
           },
-        }, meths.eval_statusline('%C%s%=%l ', { use_statuscol_lnum = 4, highlights = true }))
-        eq({
-          str = '3 ',
-          width = 2,
-          highlights = {
-            { group = 'LineNr', start = 0 },
-            { group = 'ErrorMsg', start = 1 },
-          },
-        }, meths.eval_statusline(
-          '%l%#ErrorMsg# ',
-          { use_statuscol_lnum = 3, highlights = true }
+        }, meths.nvim_eval_statusline(
+          '%C%s%=%l ',
+          { use_statuscol_lnum = 4, highlights = true }
         ))
+        eq(
+          {
+            str = '3 ',
+            width = 2,
+            highlights = {
+              { group = 'LineNr', start = 0 },
+              { group = 'ErrorMsg', start = 1 },
+            },
+          },
+          meths.nvim_eval_statusline(
+            '%l%#ErrorMsg# ',
+            { use_statuscol_lnum = 3, highlights = true }
+          )
+        )
       end)
       it('no memory leak with click functions', function()
-        meths.eval_statusline('%@ClickFunc@StatusLineStringWithClickFunc%T', {})
+        meths.nvim_eval_statusline('%@ClickFunc@StatusLineStringWithClickFunc%T', {})
         eq({
           str = 'StatusLineStringWithClickFunc',
           width = 29,
-        }, meths.eval_statusline('%@ClickFunc@StatusLineStringWithClickFunc%T', {}))
+        }, meths.nvim_eval_statusline('%@ClickFunc@StatusLineStringWithClickFunc%T', {}))
       end)
     end)
   end)
@@ -3859,7 +3884,7 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('echo foo', {}))
+      }, meths.nvim_parse_cmd('echo foo', {}))
     end)
     it('works with ranges', function()
       eq({
@@ -3899,7 +3924,7 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('4,6s/math.random/math.max/', {}))
+      }, meths.nvim_parse_cmd('4,6s/math.random/math.max/', {}))
     end)
     it('works with count', function()
       eq({
@@ -3940,7 +3965,7 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('buffer 1', {}))
+      }, meths.nvim_parse_cmd('buffer 1', {}))
     end)
     it('works with register', function()
       eq({
@@ -3981,7 +4006,7 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('put +', {}))
+      }, meths.nvim_parse_cmd('put +', {}))
       eq({
         cmd = 'put',
         args = {},
@@ -4020,7 +4045,7 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('put', {}))
+      }, meths.nvim_parse_cmd('put', {}))
     end)
     it('works with range, count and register', function()
       eq({
@@ -4062,7 +4087,7 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('1,3delete * 5', {}))
+      }, meths.nvim_parse_cmd('1,3delete * 5', {}))
     end)
     it('works with bang', function()
       eq({
@@ -4102,91 +4127,97 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('w!', {}))
+      }, meths.nvim_parse_cmd('w!', {}))
     end)
     it('works with modifiers', function()
-      eq({
-        cmd = 'split',
-        args = { 'foo.txt' },
-        bang = false,
-        range = {},
-        addr = '?',
-        magic = {
-          file = true,
-          bar = true,
-        },
-        nargs = '?',
-        nextcmd = '',
-        mods = {
-          browse = false,
-          confirm = false,
-          emsg_silent = true,
-          filter = {
-            pattern = 'foo',
-            force = false,
+      eq(
+        {
+          cmd = 'split',
+          args = { 'foo.txt' },
+          bang = false,
+          range = {},
+          addr = '?',
+          magic = {
+            file = true,
+            bar = true,
+          },
+          nargs = '?',
+          nextcmd = '',
+          mods = {
+            browse = false,
+            confirm = false,
+            emsg_silent = true,
+            filter = {
+              pattern = 'foo',
+              force = false,
+            },
+            hide = false,
+            horizontal = true,
+            keepalt = false,
+            keepjumps = false,
+            keepmarks = false,
+            keeppatterns = false,
+            lockmarks = false,
+            noautocmd = false,
+            noswapfile = false,
+            sandbox = false,
+            silent = true,
+            split = 'topleft',
+            tab = 1,
+            unsilent = false,
+            verbose = 15,
+            vertical = false,
           },
-          hide = false,
-          horizontal = true,
-          keepalt = false,
-          keepjumps = false,
-          keepmarks = false,
-          keeppatterns = false,
-          lockmarks = false,
-          noautocmd = false,
-          noswapfile = false,
-          sandbox = false,
-          silent = true,
-          split = 'topleft',
-          tab = 1,
-          unsilent = false,
-          verbose = 15,
-          vertical = false,
-        },
-      }, meths.parse_cmd(
-        '15verbose silent! horizontal topleft tab filter /foo/ split foo.txt',
-        {}
-      ))
-      eq({
-        cmd = 'split',
-        args = { 'foo.txt' },
-        bang = false,
-        range = {},
-        addr = '?',
-        magic = {
-          file = true,
-          bar = true,
         },
-        nargs = '?',
-        nextcmd = '',
-        mods = {
-          browse = false,
-          confirm = true,
-          emsg_silent = false,
-          filter = {
-            pattern = 'foo',
-            force = true,
+        meths.nvim_parse_cmd(
+          '15verbose silent! horizontal topleft tab filter /foo/ split foo.txt',
+          {}
+        )
+      )
+      eq(
+        {
+          cmd = 'split',
+          args = { 'foo.txt' },
+          bang = false,
+          range = {},
+          addr = '?',
+          magic = {
+            file = true,
+            bar = true,
+          },
+          nargs = '?',
+          nextcmd = '',
+          mods = {
+            browse = false,
+            confirm = true,
+            emsg_silent = false,
+            filter = {
+              pattern = 'foo',
+              force = true,
+            },
+            hide = false,
+            horizontal = false,
+            keepalt = false,
+            keepjumps = false,
+            keepmarks = false,
+            keeppatterns = false,
+            lockmarks = false,
+            noautocmd = false,
+            noswapfile = false,
+            sandbox = false,
+            silent = false,
+            split = 'botright',
+            tab = 0,
+            unsilent = true,
+            verbose = 0,
+            vertical = false,
           },
-          hide = false,
-          horizontal = false,
-          keepalt = false,
-          keepjumps = false,
-          keepmarks = false,
-          keeppatterns = false,
-          lockmarks = false,
-          noautocmd = false,
-          noswapfile = false,
-          sandbox = false,
-          silent = false,
-          split = 'botright',
-          tab = 0,
-          unsilent = true,
-          verbose = 0,
-          vertical = false,
         },
-      }, meths.parse_cmd(
-        '0verbose unsilent botright 0tab confirm filter! /foo/ split foo.txt',
-        {}
-      ))
+        meths.nvim_parse_cmd(
+          '0verbose unsilent botright 0tab confirm filter! /foo/ split foo.txt',
+          {}
+        )
+      )
     end)
     it('works with user commands', function()
       command('command -bang -nargs=+ -range -addr=lines MyCommand echo foo')
@@ -4227,7 +4258,7 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('4,6MyCommand! test it', {}))
+      }, meths.nvim_parse_cmd('4,6MyCommand! test it', {}))
     end)
     it('works for commands separated by bar', function()
       eq({
@@ -4267,7 +4298,7 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('argadd a.txt | argadd b.txt', {}))
+      }, meths.nvim_parse_cmd('argadd a.txt | argadd b.txt', {}))
     end)
     it('works for nargs=1', function()
       command('command -nargs=1 MyCommand echo <q-args>')
@@ -4307,28 +4338,28 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('MyCommand test it', {}))
+      }, meths.nvim_parse_cmd('MyCommand test it', {}))
     end)
     it('validates command', function()
-      eq('Error while parsing command line', pcall_err(meths.parse_cmd, '', {}))
-      eq('Error while parsing command line', pcall_err(meths.parse_cmd, '" foo', {}))
+      eq('Error while parsing command line', pcall_err(meths.nvim_parse_cmd, '', {}))
+      eq('Error while parsing command line', pcall_err(meths.nvim_parse_cmd, '" foo', {}))
       eq(
         'Error while parsing command line: E492: Not an editor command: Fubar',
-        pcall_err(meths.parse_cmd, 'Fubar', {})
+        pcall_err(meths.nvim_parse_cmd, 'Fubar', {})
       )
       command('command! Fubar echo foo')
       eq(
         'Error while parsing command line: E477: No ! allowed',
-        pcall_err(meths.parse_cmd, 'Fubar!', {})
+        pcall_err(meths.nvim_parse_cmd, 'Fubar!', {})
       )
       eq(
         'Error while parsing command line: E481: No range allowed',
-        pcall_err(meths.parse_cmd, '4,6Fubar', {})
+        pcall_err(meths.nvim_parse_cmd, '4,6Fubar', {})
       )
       command('command! Foobar echo foo')
       eq(
         'Error while parsing command line: E464: Ambiguous use of user-defined command',
-        pcall_err(meths.parse_cmd, 'F', {})
+        pcall_err(meths.nvim_parse_cmd, 'F', {})
       )
     end)
     it('does not interfere with printing line in Ex mode #19400', function()
@@ -4350,7 +4381,7 @@ describe('API', function()
         Entering Ex mode.  Type "visual" to go to Normal mode.      |
         :1^                                                          |
       ]])
-      eq('Error while parsing command line', pcall_err(meths.parse_cmd, '', {}))
+      eq('Error while parsing command line', pcall_err(meths.nvim_parse_cmd, '', {}))
       feed('<CR>')
       screen:expect([[
         foo                                                         |
@@ -4363,8 +4394,8 @@ describe('API', function()
       ]])
     end)
     it('does not move cursor or change search history/pattern #19878 #19890', function()
-      meths.buf_set_lines(0, 0, -1, true, { 'foo', 'bar', 'foo', 'bar' })
-      eq({ 1, 0 }, meths.win_get_cursor(0))
+      meths.nvim_buf_set_lines(0, 0, -1, true, { 'foo', 'bar', 'foo', 'bar' })
+      eq({ 1, 0 }, meths.nvim_win_get_cursor(0))
       eq('', funcs.getreg('/'))
       eq('', funcs.histget('search'))
       feed(':') -- call the API in cmdline mode to test whether it changes search history
@@ -4405,15 +4436,15 @@ describe('API', function()
           verbose = -1,
           vertical = false,
         },
-      }, meths.parse_cmd('+2;/bar/normal! x', {}))
-      eq({ 1, 0 }, meths.win_get_cursor(0))
+      }, meths.nvim_parse_cmd('+2;/bar/normal! x', {}))
+      eq({ 1, 0 }, meths.nvim_win_get_cursor(0))
       eq('', funcs.getreg('/'))
       eq('', funcs.histget('search'))
     end)
     it('result can be used directly by nvim_cmd #20051', function()
-      eq('foo', meths.cmd(meths.parse_cmd('echo "foo"', {}), { output = true }))
-      meths.cmd(meths.parse_cmd('set cursorline', {}), {})
-      eq(true, meths.get_option_value('cursorline', {}))
+      eq('foo', meths.nvim_cmd(meths.nvim_parse_cmd('echo "foo"', {}), { output = true }))
+      meths.nvim_cmd(meths.nvim_parse_cmd('set cursorline', {}), {})
+      eq(true, meths.nvim_get_option_value('cursorline', {}))
     end)
     it('no side-effects (error messages) in pcall() #20339', function()
       eq(
@@ -4426,80 +4457,86 @@ describe('API', function()
 
   describe('nvim_cmd', function()
     it('works', function()
-      meths.cmd({ cmd = 'set', args = { 'cursorline' } }, {})
-      eq(true, meths.get_option_value('cursorline', {}))
+      meths.nvim_cmd({ cmd = 'set', args = { 'cursorline' } }, {})
+      eq(true, meths.nvim_get_option_value('cursorline', {}))
     end)
 
     it('validation', function()
-      eq("Invalid 'cmd': expected non-empty String", pcall_err(meths.cmd, { cmd = '' }, {}))
-      eq("Invalid 'cmd': expected String, got Array", pcall_err(meths.cmd, { cmd = {} }, {}))
+      eq("Invalid 'cmd': expected non-empty String", pcall_err(meths.nvim_cmd, { cmd = '' }, {}))
+      eq("Invalid 'cmd': expected String, got Array", pcall_err(meths.nvim_cmd, { cmd = {} }, {}))
       eq(
         "Invalid 'args': expected Array, got Boolean",
-        pcall_err(meths.cmd, { cmd = 'set', args = true }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'set', args = true }, {})
       )
       eq(
         'Invalid command arg: expected non-whitespace',
-        pcall_err(meths.cmd, { cmd = 'set', args = { '  ' } }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'set', args = { '  ' } }, {})
       )
       eq(
         'Invalid command arg: expected valid type, got Array',
-        pcall_err(meths.cmd, { cmd = 'set', args = { {} } }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'set', args = { {} } }, {})
+      )
+      eq(
+        'Wrong number of arguments',
+        pcall_err(meths.nvim_cmd, { cmd = 'aboveleft', args = {} }, {})
       )
-      eq('Wrong number of arguments', pcall_err(meths.cmd, { cmd = 'aboveleft', args = {} }, {}))
       eq(
         'Command cannot accept bang: print',
-        pcall_err(meths.cmd, { cmd = 'print', args = {}, bang = true }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'print', args = {}, bang = true }, {})
       )
 
       eq(
         'Command cannot accept range: set',
-        pcall_err(meths.cmd, { cmd = 'set', args = {}, range = { 1 } }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'set', args = {}, range = { 1 } }, {})
       )
       eq(
         "Invalid 'range': expected Array, got Boolean",
-        pcall_err(meths.cmd, { cmd = 'print', args = {}, range = true }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'print', args = {}, range = true }, {})
       )
       eq(
         "Invalid 'range': expected <=2 elements",
-        pcall_err(meths.cmd, { cmd = 'print', args = {}, range = { 1, 2, 3, 4 } }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'print', args = {}, range = { 1, 2, 3, 4 } }, {})
       )
       eq(
         'Invalid range element: expected non-negative Integer',
-        pcall_err(meths.cmd, { cmd = 'print', args = {}, range = { -1 } }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'print', args = {}, range = { -1 } }, {})
       )
 
       eq(
         'Command cannot accept count: set',
-        pcall_err(meths.cmd, { cmd = 'set', args = {}, count = 1 }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'set', args = {}, count = 1 }, {})
       )
       eq(
         "Invalid 'count': expected Integer, got Boolean",
-        pcall_err(meths.cmd, { cmd = 'print', args = {}, count = true }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'print', args = {}, count = true }, {})
       )
       eq(
         "Invalid 'count': expected non-negative Integer",
-        pcall_err(meths.cmd, { cmd = 'print', args = {}, count = -1 }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'print', args = {}, count = -1 }, {})
       )
 
       eq(
         'Command cannot accept register: set',
-        pcall_err(meths.cmd, { cmd = 'set', args = {}, reg = 'x' }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'set', args = {}, reg = 'x' }, {})
+      )
+      eq(
+        'Cannot use register "=',
+        pcall_err(meths.nvim_cmd, { cmd = 'put', args = {}, reg = '=' }, {})
       )
-      eq('Cannot use register "=', pcall_err(meths.cmd, { cmd = 'put', args = {}, reg = '=' }, {}))
       eq(
         "Invalid 'reg': expected single character, got xx",
-        pcall_err(meths.cmd, { cmd = 'put', args = {}, reg = 'xx' }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'put', args = {}, reg = 'xx' }, {})
       )
 
       -- #20681
-      eq('Invalid command: "win_getid"', pcall_err(meths.cmd, { cmd = 'win_getid' }, {}))
-      eq('Invalid command: "echo "hi""', pcall_err(meths.cmd, { cmd = 'echo "hi"' }, {}))
+      eq('Invalid command: "win_getid"', pcall_err(meths.nvim_cmd, { cmd = 'win_getid' }, {}))
+      eq('Invalid command: "echo "hi""', pcall_err(meths.nvim_cmd, { cmd = 'echo "hi"' }, {}))
       eq('Invalid command: "win_getid"', pcall_err(exec_lua, [[return vim.cmd.win_getid{}]]))
 
       -- Lua call allows empty {} for dict item.
       eq('', exec_lua([[return vim.cmd{ cmd = "set", args = {}, magic = {} }]]))
       eq('', exec_lua([[return vim.cmd{ cmd = "set", args = {}, mods = {} }]]))
-      eq('', meths.cmd({ cmd = 'set', args = {}, magic = {} }, {}))
+      eq('', meths.nvim_cmd({ cmd = 'set', args = {}, magic = {} }, {}))
 
       -- Lua call does not allow non-empty list-like {} for dict item.
       eq(
@@ -4517,11 +4554,11 @@ describe('API', function()
     end)
 
     it('captures output', function()
-      eq('foo', meths.cmd({ cmd = 'echo', args = { '"foo"' } }, { output = true }))
+      eq('foo', meths.nvim_cmd({ cmd = 'echo', args = { '"foo"' } }, { output = true }))
     end)
 
     it('sets correct script context', function()
-      meths.cmd({ cmd = 'set', args = { 'cursorline' } }, {})
+      meths.nvim_cmd({ cmd = 'set', args = { 'cursorline' } }, {})
       local str = exec_capture([[verbose set cursorline?]])
       neq(nil, str:find('cursorline\n\tLast set from API client %(channel id %d+%)'))
     end)
@@ -4536,7 +4573,7 @@ describe('API', function()
         line5
         line6
       ]]
-      meths.cmd({ cmd = 'del', range = { 2, 4 } }, {})
+      meths.nvim_cmd({ cmd = 'del', range = { 2, 4 } }, {})
       expect [[
         line1
         you didn't expect this
@@ -4554,7 +4591,7 @@ describe('API', function()
         line5
         line6
       ]]
-      meths.cmd({ cmd = 'del', range = { 2 }, count = 4 }, {})
+      meths.nvim_cmd({ cmd = 'del', range = { 2 }, count = 4 }, {})
       expect [[
         line1
         line5
@@ -4571,7 +4608,7 @@ describe('API', function()
         line5
         line6
       ]]
-      meths.cmd({ cmd = 'del', range = { 2, 4 }, reg = 'a' }, {})
+      meths.nvim_cmd({ cmd = 'del', range = { 2, 4 }, reg = 'a' }, {})
       command('1put a')
       expect [[
         line1
@@ -4584,26 +4621,29 @@ describe('API', function()
       ]]
     end)
     it('works with bang', function()
-      meths.create_user_command('Foo', 'echo "<bang>"', { bang = true })
-      eq('!', meths.cmd({ cmd = 'Foo', bang = true }, { output = true }))
-      eq('', meths.cmd({ cmd = 'Foo', bang = false }, { output = true }))
+      meths.nvim_create_user_command('Foo', 'echo "<bang>"', { bang = true })
+      eq('!', meths.nvim_cmd({ cmd = 'Foo', bang = true }, { output = true }))
+      eq('', meths.nvim_cmd({ cmd = 'Foo', bang = false }, { output = true }))
     end)
     it('works with modifiers', function()
       -- with silent = true output is still captured
       eq(
         '1',
-        meths.cmd({ cmd = 'echomsg', args = { '1' }, mods = { silent = true } }, { output = true })
+        meths.nvim_cmd(
+          { cmd = 'echomsg', args = { '1' }, mods = { silent = true } },
+          { output = true }
+        )
       )
       -- but message isn't added to message history
-      eq('', meths.cmd({ cmd = 'messages' }, { output = true }))
+      eq('', meths.nvim_cmd({ cmd = 'messages' }, { output = true }))
 
-      meths.create_user_command('Foo', 'set verbose', {})
-      eq('  verbose=1', meths.cmd({ cmd = 'Foo', mods = { verbose = 1 } }, { output = true }))
+      meths.nvim_create_user_command('Foo', 'set verbose', {})
+      eq('  verbose=1', meths.nvim_cmd({ cmd = 'Foo', mods = { verbose = 1 } }, { output = true }))
 
-      meths.create_user_command('Mods', "echo '<mods>'", {})
+      meths.nvim_create_user_command('Mods', "echo '<mods>'", {})
       eq(
         'keepmarks keeppatterns silent 3verbose aboveleft horizontal',
-        meths.cmd({
+        meths.nvim_cmd({
           cmd = 'Mods',
           mods = {
             horizontal = true,
@@ -4615,19 +4655,19 @@ describe('API', function()
           },
         }, { output = true })
       )
-      eq(0, meths.get_option_value('verbose', {}))
+      eq(0, meths.nvim_get_option_value('verbose', {}))
 
       command('edit foo.txt | edit bar.txt')
       eq(
         '  1 #h   "foo.txt"                      line 1',
-        meths.cmd(
+        meths.nvim_cmd(
           { cmd = 'buffers', mods = { filter = { pattern = 'foo', force = false } } },
           { output = true }
         )
       )
       eq(
         '  2 %a   "bar.txt"                      line 1',
-        meths.cmd(
+        meths.nvim_cmd(
           { cmd = 'buffers', mods = { filter = { pattern = 'foo', force = true } } },
           { output = true }
         )
@@ -4635,10 +4675,10 @@ describe('API', function()
 
       -- with emsg_silent = true error is suppressed
       feed([[:lua vim.api.nvim_cmd({ cmd = 'call', mods = { emsg_silent = true } }, {})<CR>]])
-      eq('', meths.cmd({ cmd = 'messages' }, { output = true }))
+      eq('', meths.nvim_cmd({ cmd = 'messages' }, { output = true }))
       -- error from the next command typed is not suppressed #21420
       feed(':call<CR><CR>')
-      eq('E471: Argument required', meths.cmd({ cmd = 'messages' }, { output = true }))
+      eq('E471: Argument required', meths.nvim_cmd({ cmd = 'messages' }, { output = true }))
     end)
     it('works with magic.file', function()
       exec_lua([[
@@ -4648,7 +4688,10 @@ describe('API', function()
       ]])
       eq(
         uv.cwd(),
-        meths.cmd({ cmd = 'Foo', args = { '%:p:h' }, magic = { file = true } }, { output = true })
+        meths.nvim_cmd(
+          { cmd = 'Foo', args = { '%:p:h' }, magic = { file = true } },
+          { output = true }
+        )
       )
     end)
     it('splits arguments correctly', function()
@@ -4657,24 +4700,24 @@ describe('API', function()
           echo a:000
         endfunction
       ]])
-      meths.create_user_command('Foo', 'call FooFunc(<f-args>)', { nargs = '+' })
+      meths.nvim_create_user_command('Foo', 'call FooFunc(<f-args>)', { nargs = '+' })
       eq(
         [=[['a quick', 'brown fox', 'jumps over the', 'lazy dog']]=],
-        meths.cmd(
+        meths.nvim_cmd(
           { cmd = 'Foo', args = { 'a quick', 'brown fox', 'jumps over the', 'lazy dog' } },
           { output = true }
         )
       )
       eq(
         [=[['test \ \\ \"""\', 'more\ tests\"  ']]=],
-        meths.cmd(
+        meths.nvim_cmd(
           { cmd = 'Foo', args = { [[test \ \\ \"""\]], [[more\ tests\"  ]] } },
           { output = true }
         )
       )
     end)
     it('splits arguments correctly for Lua callback', function()
-      meths.exec_lua(
+      meths.nvim_exec_lua(
         [[
         local function FooFunc(opts)
           vim.print(opts.fargs)
@@ -4686,14 +4729,14 @@ describe('API', function()
       )
       eq(
         [[{ "a quick", "brown fox", "jumps over the", "lazy dog" }]],
-        meths.cmd(
+        meths.nvim_cmd(
           { cmd = 'Foo', args = { 'a quick', 'brown fox', 'jumps over the', 'lazy dog' } },
           { output = true }
         )
       )
       eq(
         [[{ 'test \\ \\\\ \\"""\\', 'more\\ tests\\"  ' }]],
-        meths.cmd(
+        meths.nvim_cmd(
           { cmd = 'Foo', args = { [[test \ \\ \"""\]], [[more\ tests\"  ]] } },
           { output = true }
         )
@@ -4701,13 +4744,13 @@ describe('API', function()
     end)
     it('works with buffer names', function()
       command('edit foo.txt | edit bar.txt')
-      meths.cmd({ cmd = 'buffer', args = { 'foo.txt' } }, {})
-      eq('foo.txt', funcs.fnamemodify(meths.buf_get_name(0), ':t'))
-      meths.cmd({ cmd = 'buffer', args = { 'bar.txt' } }, {})
-      eq('bar.txt', funcs.fnamemodify(meths.buf_get_name(0), ':t'))
+      meths.nvim_cmd({ cmd = 'buffer', args = { 'foo.txt' } }, {})
+      eq('foo.txt', funcs.fnamemodify(meths.nvim_buf_get_name(0), ':t'))
+      meths.nvim_cmd({ cmd = 'buffer', args = { 'bar.txt' } }, {})
+      eq('bar.txt', funcs.fnamemodify(meths.nvim_buf_get_name(0), ':t'))
     end)
     it('triggers CmdUndefined event if command is not found', function()
-      meths.exec_lua(
+      meths.nvim_exec_lua(
         [[
         vim.api.nvim_create_autocmd("CmdUndefined",
                                     { pattern = "Foo",
@@ -4718,17 +4761,17 @@ describe('API', function()
       ]],
         {}
       )
-      eq('foo', meths.cmd({ cmd = 'Foo' }, { output = true }))
+      eq('foo', meths.nvim_cmd({ cmd = 'Foo' }, { output = true }))
     end)
     it('errors if command is not implemented', function()
-      eq('Command not implemented: winpos', pcall_err(meths.cmd, { cmd = 'winpos' }, {}))
+      eq('Command not implemented: winpos', pcall_err(meths.nvim_cmd, { cmd = 'winpos' }, {}))
     end)
     it('works with empty arguments list', function()
-      meths.cmd({ cmd = 'update' }, {})
-      meths.cmd({ cmd = 'buffer', count = 0 }, {})
+      meths.nvim_cmd({ cmd = 'update' }, {})
+      meths.nvim_cmd({ cmd = 'buffer', count = 0 }, {})
     end)
     it("doesn't suppress errors when used in keymapping", function()
-      meths.exec_lua(
+      meths.nvim_exec_lua(
         [[
         vim.keymap.set("n", "[l",
                        function() vim.api.nvim_cmd({ cmd = "echo", args = {"foo"} }, {}) end)
@@ -4739,31 +4782,31 @@ describe('API', function()
       neq(nil, string.find(eval('v:errmsg'), 'E5108:'))
     end)
     it('handles 0 range #19608', function()
-      meths.buf_set_lines(0, 0, -1, false, { 'aa' })
-      meths.cmd({ cmd = 'delete', range = { 0 } }, {})
+      meths.nvim_buf_set_lines(0, 0, -1, false, { 'aa' })
+      meths.nvim_cmd({ cmd = 'delete', range = { 0 } }, {})
       command('undo')
-      eq({ 'aa' }, meths.buf_get_lines(0, 0, 1, false))
+      eq({ 'aa' }, meths.nvim_buf_get_lines(0, 0, 1, false))
       assert_alive()
     end)
     it('supports filename expansion', function()
-      meths.cmd({ cmd = 'argadd', args = { '%:p:h:t', '%:p:h:t' } }, {})
+      meths.nvim_cmd({ cmd = 'argadd', args = { '%:p:h:t', '%:p:h:t' } }, {})
       local arg = funcs.expand('%:p:h:t')
       eq({ arg, arg }, funcs.argv())
     end)
     it("'make' command works when argument count isn't 1 #19696", function()
       command('set makeprg=echo')
       command('set shellquote=')
-      matches('^:!echo ', meths.cmd({ cmd = 'make' }, { output = true }))
+      matches('^:!echo ', meths.nvim_cmd({ cmd = 'make' }, { output = true }))
       assert_alive()
       matches(
         '^:!echo foo bar',
-        meths.cmd({ cmd = 'make', args = { 'foo', 'bar' } }, { output = true })
+        meths.nvim_cmd({ cmd = 'make', args = { 'foo', 'bar' } }, { output = true })
       )
       assert_alive()
       local arg_pesc = pesc(funcs.expand('%:p:h:t'))
       matches(
         ('^:!echo %s %s'):format(arg_pesc, arg_pesc),
-        meths.cmd({ cmd = 'make', args = { '%:p:h:t', '%:p:h:t' } }, { output = true })
+        meths.nvim_cmd({ cmd = 'make', args = { '%:p:h:t', '%:p:h:t' } }, { output = true })
       )
       assert_alive()
     end)
@@ -4773,7 +4816,7 @@ describe('API', function()
       screen:set_default_attr_ids({
         [0] = { bold = true, foreground = Screen.colors.Blue },
       })
-      meths.cmd({ cmd = 'echo', args = { [['hello']] } }, { output = true })
+      meths.nvim_cmd({ cmd = 'echo', args = { [['hello']] } }, { output = true })
       screen:expect {
         grid = [[
         ^                                        |
@@ -4796,29 +4839,29 @@ describe('API', function()
       }
     end)
     it('works with non-String args', function()
-      eq('2', meths.cmd({ cmd = 'echo', args = { 2 } }, { output = true }))
-      eq('1', meths.cmd({ cmd = 'echo', args = { true } }, { output = true }))
+      eq('2', meths.nvim_cmd({ cmd = 'echo', args = { 2 } }, { output = true }))
+      eq('1', meths.nvim_cmd({ cmd = 'echo', args = { true } }, { output = true }))
     end)
     describe('first argument as count', function()
       it('works', function()
         command('vsplit | enew')
-        meths.cmd({ cmd = 'bdelete', args = { meths.get_current_buf() } }, {})
-        eq(1, meths.get_current_buf().id)
+        meths.nvim_cmd({ cmd = 'bdelete', args = { meths.nvim_get_current_buf() } }, {})
+        eq(1, meths.nvim_get_current_buf().id)
       end)
       it('works with :sleep using milliseconds', function()
         local start = uv.now()
-        meths.cmd({ cmd = 'sleep', args = { '100m' } }, {})
+        meths.nvim_cmd({ cmd = 'sleep', args = { '100m' } }, {})
         ok(uv.now() - start <= 300)
       end)
     end)
     it(':call with unknown function does not crash #26289', function()
       eq(
         'Vim:E117: Unknown function: UnknownFunc',
-        pcall_err(meths.cmd, { cmd = 'call', args = { 'UnknownFunc()' } }, {})
+        pcall_err(meths.nvim_cmd, { cmd = 'call', args = { 'UnknownFunc()' } }, {})
       )
     end)
     it(':throw does not crash #24556', function()
-      eq('42', pcall_err(meths.cmd, { cmd = 'throw', args = { '42' } }, {}))
+      eq('42', pcall_err(meths.nvim_cmd, { cmd = 'throw', args = { '42' } }, {}))
     end)
     it('can use :return #24556', function()
       exec([[
@@ -4829,8 +4872,8 @@ describe('API', function()
         endfunc
         let g:result = Foo()
       ]])
-      eq('before', meths.get_var('pos'))
-      eq({ 1, 2, 3 }, meths.get_var('result'))
+      eq('before', meths.nvim_get_var('pos'))
+      eq({ 1, 2, 3 }, meths.nvim_get_var('result'))
     end)
   end)
 end)
diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index 2516e96be2..9542272447 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -53,9 +53,9 @@ describe('API/win', function()
     end)
 
     it('disallowed in cmdwin if win={old_}curwin or buf=curbuf', function()
-      local new_buf = meths.create_buf(true, true)
-      local old_win = meths.get_current_win()
-      local new_win = meths.open_win(new_buf, false, {
+      local new_buf = meths.nvim_create_buf(true, true)
+      local old_win = meths.nvim_get_current_win()
+      local new_win = meths.nvim_open_win(new_buf, false, {
         relative = 'editor',
         row = 10,
         col = 10,
@@ -65,20 +65,20 @@ describe('API/win', function()
       feed('q:')
       eq(
         'E11: Invalid in command-line window; <CR> executes, CTRL-C quits',
-        pcall_err(meths.win_set_buf, 0, new_buf)
+        pcall_err(meths.nvim_win_set_buf, 0, new_buf)
       )
       eq(
         'E11: Invalid in command-line window; <CR> executes, CTRL-C quits',
-        pcall_err(meths.win_set_buf, old_win, new_buf)
+        pcall_err(meths.nvim_win_set_buf, old_win, new_buf)
       )
       eq(
         'E11: Invalid in command-line window; <CR> executes, CTRL-C quits',
-        pcall_err(meths.win_set_buf, new_win, 0)
+        pcall_err(meths.nvim_win_set_buf, new_win, 0)
       )
 
-      local next_buf = meths.create_buf(true, true)
-      meths.win_set_buf(new_win, next_buf)
-      eq(next_buf, meths.win_get_buf(new_win))
+      local next_buf = meths.nvim_create_buf(true, true)
+      meths.nvim_win_set_buf(new_win, next_buf)
+      eq(next_buf, meths.nvim_win_get_buf(new_win))
     end)
   end)
 
@@ -94,7 +94,7 @@ describe('API/win', function()
     end)
 
     it('does not leak memory when using invalid window ID with invalid pos', function()
-      eq('Invalid window id: 1', pcall_err(meths.win_set_cursor, 1, { 'b\na' }))
+      eq('Invalid window id: 1', pcall_err(meths.nvim_win_set_cursor, 1, { 'b\na' }))
     end)
 
     it('updates the screen, and also when the window is unfocused', function()
@@ -334,7 +334,7 @@ describe('API/win', function()
         call nvim_win_set_height(w, 5)
       ]])
       feed('l')
-      eq('', meths.get_vvar('errmsg'))
+      eq('', meths.nvim_get_vvar('errmsg'))
     end)
   end)
 
@@ -365,7 +365,7 @@ describe('API/win', function()
         call nvim_win_set_width(w, 5)
       ]])
       feed('l')
-      eq('', meths.get_vvar('errmsg'))
+      eq('', meths.nvim_get_vvar('errmsg'))
     end)
   end)
 
@@ -501,48 +501,48 @@ describe('API/win', function()
 
   describe('close', function()
     it('can close current window', function()
-      local oldwin = meths.get_current_win()
+      local oldwin = meths.nvim_get_current_win()
       command('split')
-      local newwin = meths.get_current_win()
-      meths.win_close(newwin, false)
-      eq({ oldwin }, meths.list_wins())
+      local newwin = meths.nvim_get_current_win()
+      meths.nvim_win_close(newwin, false)
+      eq({ oldwin }, meths.nvim_list_wins())
     end)
 
     it('can close noncurrent window', function()
-      local oldwin = meths.get_current_win()
+      local oldwin = meths.nvim_get_current_win()
       command('split')
-      local newwin = meths.get_current_win()
-      meths.win_close(oldwin, false)
-      eq({ newwin }, meths.list_wins())
+      local newwin = meths.nvim_get_current_win()
+      meths.nvim_win_close(oldwin, false)
+      eq({ newwin }, meths.nvim_list_wins())
     end)
 
     it("handles changed buffer when 'hidden' is unset", function()
       command('set nohidden')
-      local oldwin = meths.get_current_win()
+      local oldwin = meths.nvim_get_current_win()
       insert('text')
       command('new')
-      local newwin = meths.get_current_win()
+      local newwin = meths.nvim_get_current_win()
       eq(
         'Vim:E37: No write since last change (add ! to override)',
-        pcall_err(meths.win_close, oldwin, false)
+        pcall_err(meths.nvim_win_close, oldwin, false)
       )
-      eq({ newwin, oldwin }, meths.list_wins())
+      eq({ newwin, oldwin }, meths.nvim_list_wins())
     end)
 
     it('handles changed buffer with force', function()
-      local oldwin = meths.get_current_win()
+      local oldwin = meths.nvim_get_current_win()
       insert('text')
       command('new')
-      local newwin = meths.get_current_win()
-      meths.win_close(oldwin, true)
-      eq({ newwin }, meths.list_wins())
+      local newwin = meths.nvim_get_current_win()
+      meths.nvim_win_close(oldwin, true)
+      eq({ newwin }, meths.nvim_list_wins())
     end)
 
     it('in cmdline-window #9767', function()
       command('split')
-      eq(2, #meths.list_wins())
-      local oldwin = meths.get_current_win()
-      local otherwin = meths.open_win(0, false, {
+      eq(2, #meths.nvim_list_wins())
+      local oldwin = meths.nvim_get_current_win()
+      local otherwin = meths.nvim_open_win(0, false, {
         relative = 'editor',
         row = 10,
         col = 10,
@@ -551,19 +551,19 @@ describe('API/win', function()
       })
       -- Open cmdline-window.
       feed('q:')
-      eq(4, #meths.list_wins())
+      eq(4, #meths.nvim_list_wins())
       eq(':', funcs.getcmdwintype())
       -- Not allowed to close previous window from cmdline-window.
       eq(
         'E11: Invalid in command-line window; <CR> executes, CTRL-C quits',
-        pcall_err(meths.win_close, oldwin, true)
+        pcall_err(meths.nvim_win_close, oldwin, true)
       )
       -- Closing other windows is fine.
-      meths.win_close(otherwin, true)
-      eq(false, meths.win_is_valid(otherwin))
+      meths.nvim_win_close(otherwin, true)
+      eq(false, meths.nvim_win_is_valid(otherwin))
       -- Close cmdline-window.
-      meths.win_close(0, true)
-      eq(2, #meths.list_wins())
+      meths.nvim_win_close(0, true)
+      eq(2, #meths.nvim_list_wins())
       eq('', funcs.getcmdwintype())
     end)
 
@@ -572,7 +572,7 @@ describe('API/win', function()
       command('botright split')
       local prevwin = curwin().id
       eq(2, eval('tabpagenr()'))
-      local win = meths.open_win(0, true, {
+      local win = meths.nvim_open_win(0, true, {
         relative = 'editor',
         row = 10,
         col = 10,
@@ -582,67 +582,67 @@ describe('API/win', function()
       local tab = eval('tabpagenr()')
       command('tabprevious')
       eq(1, eval('tabpagenr()'))
-      meths.win_close(win, false)
+      meths.nvim_win_close(win, false)
 
-      eq(prevwin, meths.tabpage_get_win(tab).id)
+      eq(prevwin, meths.nvim_tabpage_get_win(tab).id)
       assert_alive()
     end)
   end)
 
   describe('hide', function()
     it('can hide current window', function()
-      local oldwin = meths.get_current_win()
+      local oldwin = meths.nvim_get_current_win()
       command('split')
-      local newwin = meths.get_current_win()
-      meths.win_hide(newwin)
-      eq({ oldwin }, meths.list_wins())
+      local newwin = meths.nvim_get_current_win()
+      meths.nvim_win_hide(newwin)
+      eq({ oldwin }, meths.nvim_list_wins())
     end)
     it('can hide noncurrent window', function()
-      local oldwin = meths.get_current_win()
+      local oldwin = meths.nvim_get_current_win()
       command('split')
-      local newwin = meths.get_current_win()
-      meths.win_hide(oldwin)
-      eq({ newwin }, meths.list_wins())
+      local newwin = meths.nvim_get_current_win()
+      meths.nvim_win_hide(oldwin)
+      eq({ newwin }, meths.nvim_list_wins())
     end)
     it('does not close the buffer', function()
-      local oldwin = meths.get_current_win()
-      local oldbuf = meths.get_current_buf()
-      local buf = meths.create_buf(true, false)
-      local newwin = meths.open_win(buf, true, {
+      local oldwin = meths.nvim_get_current_win()
+      local oldbuf = meths.nvim_get_current_buf()
+      local buf = meths.nvim_create_buf(true, false)
+      local newwin = meths.nvim_open_win(buf, true, {
         relative = 'win',
         row = 3,
         col = 3,
         width = 12,
         height = 3,
       })
-      meths.win_hide(newwin)
-      eq({ oldwin }, meths.list_wins())
-      eq({ oldbuf, buf }, meths.list_bufs())
+      meths.nvim_win_hide(newwin)
+      eq({ oldwin }, meths.nvim_list_wins())
+      eq({ oldbuf, buf }, meths.nvim_list_bufs())
     end)
     it('deletes the buffer when bufhidden=wipe', function()
-      local oldwin = meths.get_current_win()
-      local oldbuf = meths.get_current_buf()
-      local buf = meths.create_buf(true, false).id
-      local newwin = meths.open_win(buf, true, {
+      local oldwin = meths.nvim_get_current_win()
+      local oldbuf = meths.nvim_get_current_buf()
+      local buf = meths.nvim_create_buf(true, false).id
+      local newwin = meths.nvim_open_win(buf, true, {
         relative = 'win',
         row = 3,
         col = 3,
         width = 12,
         height = 3,
       })
-      meths.set_option_value('bufhidden', 'wipe', { buf = buf })
-      meths.win_hide(newwin)
-      eq({ oldwin }, meths.list_wins())
-      eq({ oldbuf }, meths.list_bufs())
+      meths.nvim_set_option_value('bufhidden', 'wipe', { buf = buf })
+      meths.nvim_win_hide(newwin)
+      eq({ oldwin }, meths.nvim_list_wins())
+      eq({ oldbuf }, meths.nvim_list_bufs())
     end)
     it('in the cmdwin', function()
       feed('q:')
       -- Can close the cmdwin.
-      meths.win_hide(0)
+      meths.nvim_win_hide(0)
       eq('', funcs.getcmdwintype())
 
-      local old_win = meths.get_current_win()
-      local other_win = meths.open_win(0, false, {
+      local old_win = meths.nvim_get_current_win()
+      local other_win = meths.nvim_open_win(0, false, {
         relative = 'win',
         row = 3,
         col = 3,
@@ -653,24 +653,24 @@ describe('API/win', function()
       -- Cannot close the previous window.
       eq(
         'E11: Invalid in command-line window; <CR> executes, CTRL-C quits',
-        pcall_err(meths.win_hide, old_win)
+        pcall_err(meths.nvim_win_hide, old_win)
       )
       -- Can close other windows.
-      meths.win_hide(other_win)
-      eq(false, meths.win_is_valid(other_win))
+      meths.nvim_win_hide(other_win)
+      eq(false, meths.nvim_win_is_valid(other_win))
     end)
   end)
 
   describe('text_height', function()
     it('validation', function()
-      local X = meths.get_vvar('maxcol')
+      local X = meths.nvim_get_vvar('maxcol')
       insert([[
         aaa
         bbb
         ccc
         ddd
         eee]])
-      eq('Invalid window id: 23', pcall_err(meths.win_text_height, 23, {}))
+      eq('Invalid window id: 23', pcall_err(meths.nvim_win_text_height, 23, {}))
       eq('Line index out of bounds', pcall_err(curwinmeths.text_height, { start_row = 5 }))
       eq('Line index out of bounds', pcall_err(curwinmeths.text_height, { start_row = -6 }))
       eq('Line index out of bounds', pcall_err(curwinmeths.text_height, { end_row = 5 }))
@@ -713,7 +713,7 @@ describe('API/win', function()
     end)
 
     it('with two diff windows', function()
-      local X = meths.get_vvar('maxcol')
+      local X = meths.nvim_get_vvar('maxcol')
       local screen = Screen.new(45, 22)
       screen:set_default_attr_ids({
         [0] = { foreground = Screen.colors.Blue1, bold = true },
@@ -775,70 +775,88 @@ describe('API/win', function()
                                                      |
       ]],
       }
-      eq({ all = 20, fill = 5 }, meths.win_text_height(1000, {}))
-      eq({ all = 20, fill = 5 }, meths.win_text_height(1001, {}))
-      eq({ all = 20, fill = 5 }, meths.win_text_height(1000, { start_row = 0 }))
-      eq({ all = 20, fill = 5 }, meths.win_text_height(1001, { start_row = 0 }))
-      eq({ all = 15, fill = 0 }, meths.win_text_height(1000, { end_row = -1 }))
-      eq({ all = 15, fill = 0 }, meths.win_text_height(1000, { end_row = 40 }))
-      eq({ all = 20, fill = 5 }, meths.win_text_height(1001, { end_row = -1 }))
-      eq({ all = 20, fill = 5 }, meths.win_text_height(1001, { end_row = 40 }))
-      eq({ all = 10, fill = 5 }, meths.win_text_height(1000, { start_row = 23 }))
-      eq({ all = 13, fill = 3 }, meths.win_text_height(1001, { start_row = 18 }))
-      eq({ all = 11, fill = 0 }, meths.win_text_height(1000, { end_row = 23 }))
-      eq({ all = 11, fill = 5 }, meths.win_text_height(1001, { end_row = 18 }))
-      eq({ all = 11, fill = 0 }, meths.win_text_height(1000, { start_row = 3, end_row = 39 }))
-      eq({ all = 11, fill = 3 }, meths.win_text_height(1001, { start_row = 1, end_row = 34 }))
-      eq({ all = 9, fill = 0 }, meths.win_text_height(1000, { start_row = 4, end_row = 38 }))
-      eq({ all = 9, fill = 3 }, meths.win_text_height(1001, { start_row = 2, end_row = 33 }))
-      eq({ all = 9, fill = 0 }, meths.win_text_height(1000, { start_row = 5, end_row = 37 }))
-      eq({ all = 9, fill = 3 }, meths.win_text_height(1001, { start_row = 3, end_row = 32 }))
-      eq({ all = 9, fill = 0 }, meths.win_text_height(1000, { start_row = 17, end_row = 25 }))
-      eq({ all = 9, fill = 3 }, meths.win_text_height(1001, { start_row = 15, end_row = 20 }))
-      eq({ all = 7, fill = 0 }, meths.win_text_height(1000, { start_row = 18, end_row = 24 }))
-      eq({ all = 7, fill = 3 }, meths.win_text_height(1001, { start_row = 16, end_row = 19 }))
-      eq({ all = 6, fill = 5 }, meths.win_text_height(1000, { start_row = -1 }))
-      eq({ all = 5, fill = 5 }, meths.win_text_height(1000, { start_row = -1, start_vcol = X }))
+      eq({ all = 20, fill = 5 }, meths.nvim_win_text_height(1000, {}))
+      eq({ all = 20, fill = 5 }, meths.nvim_win_text_height(1001, {}))
+      eq({ all = 20, fill = 5 }, meths.nvim_win_text_height(1000, { start_row = 0 }))
+      eq({ all = 20, fill = 5 }, meths.nvim_win_text_height(1001, { start_row = 0 }))
+      eq({ all = 15, fill = 0 }, meths.nvim_win_text_height(1000, { end_row = -1 }))
+      eq({ all = 15, fill = 0 }, meths.nvim_win_text_height(1000, { end_row = 40 }))
+      eq({ all = 20, fill = 5 }, meths.nvim_win_text_height(1001, { end_row = -1 }))
+      eq({ all = 20, fill = 5 }, meths.nvim_win_text_height(1001, { end_row = 40 }))
+      eq({ all = 10, fill = 5 }, meths.nvim_win_text_height(1000, { start_row = 23 }))
+      eq({ all = 13, fill = 3 }, meths.nvim_win_text_height(1001, { start_row = 18 }))
+      eq({ all = 11, fill = 0 }, meths.nvim_win_text_height(1000, { end_row = 23 }))
+      eq({ all = 11, fill = 5 }, meths.nvim_win_text_height(1001, { end_row = 18 }))
+      eq({ all = 11, fill = 0 }, meths.nvim_win_text_height(1000, { start_row = 3, end_row = 39 }))
+      eq({ all = 11, fill = 3 }, meths.nvim_win_text_height(1001, { start_row = 1, end_row = 34 }))
+      eq({ all = 9, fill = 0 }, meths.nvim_win_text_height(1000, { start_row = 4, end_row = 38 }))
+      eq({ all = 9, fill = 3 }, meths.nvim_win_text_height(1001, { start_row = 2, end_row = 33 }))
+      eq({ all = 9, fill = 0 }, meths.nvim_win_text_height(1000, { start_row = 5, end_row = 37 }))
+      eq({ all = 9, fill = 3 }, meths.nvim_win_text_height(1001, { start_row = 3, end_row = 32 }))
+      eq({ all = 9, fill = 0 }, meths.nvim_win_text_height(1000, { start_row = 17, end_row = 25 }))
+      eq({ all = 9, fill = 3 }, meths.nvim_win_text_height(1001, { start_row = 15, end_row = 20 }))
+      eq({ all = 7, fill = 0 }, meths.nvim_win_text_height(1000, { start_row = 18, end_row = 24 }))
+      eq({ all = 7, fill = 3 }, meths.nvim_win_text_height(1001, { start_row = 16, end_row = 19 }))
+      eq({ all = 6, fill = 5 }, meths.nvim_win_text_height(1000, { start_row = -1 }))
+      eq(
+        { all = 5, fill = 5 },
+        meths.nvim_win_text_height(1000, { start_row = -1, start_vcol = X })
+      )
       eq(
         { all = 0, fill = 0 },
-        meths.win_text_height(1000, { start_row = -1, start_vcol = X, end_row = -1 })
+        meths.nvim_win_text_height(1000, { start_row = -1, start_vcol = X, end_row = -1 })
       )
       eq(
         { all = 0, fill = 0 },
-        meths.win_text_height(1000, { start_row = -1, start_vcol = X, end_row = -1, end_vcol = X })
+        meths.nvim_win_text_height(
+          1000,
+          { start_row = -1, start_vcol = X, end_row = -1, end_vcol = X }
+        )
       )
       eq(
         { all = 1, fill = 0 },
-        meths.win_text_height(1000, { start_row = -1, start_vcol = 0, end_row = -1, end_vcol = X })
+        meths.nvim_win_text_height(
+          1000,
+          { start_row = -1, start_vcol = 0, end_row = -1, end_vcol = X }
+        )
       )
-      eq({ all = 3, fill = 2 }, meths.win_text_height(1001, { end_row = 0 }))
-      eq({ all = 2, fill = 2 }, meths.win_text_height(1001, { end_row = 0, end_vcol = 0 }))
+      eq({ all = 3, fill = 2 }, meths.nvim_win_text_height(1001, { end_row = 0 }))
+      eq({ all = 2, fill = 2 }, meths.nvim_win_text_height(1001, { end_row = 0, end_vcol = 0 }))
       eq(
         { all = 2, fill = 2 },
-        meths.win_text_height(1001, { start_row = 0, end_row = 0, end_vcol = 0 })
+        meths.nvim_win_text_height(1001, { start_row = 0, end_row = 0, end_vcol = 0 })
       )
       eq(
         { all = 0, fill = 0 },
-        meths.win_text_height(1001, { start_row = 0, start_vcol = 0, end_row = 0, end_vcol = 0 })
+        meths.nvim_win_text_height(
+          1001,
+          { start_row = 0, start_vcol = 0, end_row = 0, end_vcol = 0 }
+        )
       )
       eq(
         { all = 1, fill = 0 },
-        meths.win_text_height(1001, { start_row = 0, start_vcol = 0, end_row = 0, end_vcol = X })
+        meths.nvim_win_text_height(
+          1001,
+          { start_row = 0, start_vcol = 0, end_row = 0, end_vcol = X }
+        )
       )
-      eq({ all = 11, fill = 5 }, meths.win_text_height(1001, { end_row = 18 }))
+      eq({ all = 11, fill = 5 }, meths.nvim_win_text_height(1001, { end_row = 18 }))
       eq(
         { all = 9, fill = 3 },
-        meths.win_text_height(1001, { start_row = 0, start_vcol = 0, end_row = 18 })
+        meths.nvim_win_text_height(1001, { start_row = 0, start_vcol = 0, end_row = 18 })
       )
-      eq({ all = 10, fill = 5 }, meths.win_text_height(1001, { end_row = 18, end_vcol = 0 }))
+      eq({ all = 10, fill = 5 }, meths.nvim_win_text_height(1001, { end_row = 18, end_vcol = 0 }))
       eq(
         { all = 8, fill = 3 },
-        meths.win_text_height(1001, { start_row = 0, start_vcol = 0, end_row = 18, end_vcol = 0 })
+        meths.nvim_win_text_height(
+          1001,
+          { start_row = 0, start_vcol = 0, end_row = 18, end_vcol = 0 }
+        )
       )
     end)
 
     it('with wrapped lines', function()
-      local X = meths.get_vvar('maxcol')
+      local X = meths.nvim_get_vvar('maxcol')
       local screen = Screen.new(45, 22)
       screen:set_default_attr_ids({
         [0] = { foreground = Screen.colors.Blue1, bold = true },
@@ -850,15 +868,15 @@ describe('API/win', function()
         set number cpoptions+=n
         call setline(1, repeat([repeat('foobar-', 36)], 3))
       ]])
-      local ns = meths.create_namespace('')
-      meths.buf_set_extmark(
+      local ns = meths.nvim_create_namespace('')
+      meths.nvim_buf_set_extmark(
         0,
         ns,
         1,
         100,
         { virt_text = { { ('?'):rep(15), 'Search' } }, virt_text_pos = 'inline' }
       )
-      meths.buf_set_extmark(
+      meths.nvim_buf_set_extmark(
         0,
         ns,
         2,
@@ -898,113 +916,155 @@ describe('API/win', function()
                                                      |
       ]],
       }
-      eq({ all = 21, fill = 0 }, meths.win_text_height(0, {}))
-      eq({ all = 6, fill = 0 }, meths.win_text_height(0, { start_row = 0, end_row = 0 }))
-      eq({ all = 7, fill = 0 }, meths.win_text_height(0, { start_row = 1, end_row = 1 }))
-      eq({ all = 8, fill = 0 }, meths.win_text_height(0, { start_row = 2, end_row = 2 }))
+      eq({ all = 21, fill = 0 }, meths.nvim_win_text_height(0, {}))
+      eq({ all = 6, fill = 0 }, meths.nvim_win_text_height(0, { start_row = 0, end_row = 0 }))
+      eq({ all = 7, fill = 0 }, meths.nvim_win_text_height(0, { start_row = 1, end_row = 1 }))
+      eq({ all = 8, fill = 0 }, meths.nvim_win_text_height(0, { start_row = 2, end_row = 2 }))
       eq(
         { all = 0, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 0 })
+        meths.nvim_win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 0 })
       )
       eq(
         { all = 1, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 41 })
+        meths.nvim_win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 41 })
       )
       eq(
         { all = 2, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 42 })
+        meths.nvim_win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 42 })
       )
       eq(
         { all = 2, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 86 })
+        meths.nvim_win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 86 })
       )
       eq(
         { all = 3, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 87 })
+        meths.nvim_win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 87 })
       )
       eq(
         { all = 6, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 266 })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 266 }
+        )
       )
       eq(
         { all = 7, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 267 })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 267 }
+        )
       )
       eq(
         { all = 7, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 311 })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 311 }
+        )
       )
       eq(
         { all = 7, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 312 })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = 312 }
+        )
       )
       eq(
         { all = 7, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = X })
+        meths.nvim_win_text_height(0, { start_row = 1, start_vcol = 0, end_row = 1, end_vcol = X })
       )
       eq(
         { all = 7, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 40, end_row = 1, end_vcol = X })
+        meths.nvim_win_text_height(0, { start_row = 1, start_vcol = 40, end_row = 1, end_vcol = X })
       )
       eq(
         { all = 6, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 41, end_row = 1, end_vcol = X })
+        meths.nvim_win_text_height(0, { start_row = 1, start_vcol = 41, end_row = 1, end_vcol = X })
       )
       eq(
         { all = 6, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 85, end_row = 1, end_vcol = X })
+        meths.nvim_win_text_height(0, { start_row = 1, start_vcol = 85, end_row = 1, end_vcol = X })
       )
       eq(
         { all = 5, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 86, end_row = 1, end_vcol = X })
+        meths.nvim_win_text_height(0, { start_row = 1, start_vcol = 86, end_row = 1, end_vcol = X })
       )
       eq(
         { all = 2, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 265, end_row = 1, end_vcol = X })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 1, start_vcol = 265, end_row = 1, end_vcol = X }
+        )
       )
       eq(
         { all = 1, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 266, end_row = 1, end_vcol = X })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 1, start_vcol = 266, end_row = 1, end_vcol = X }
+        )
       )
       eq(
         { all = 1, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 310, end_row = 1, end_vcol = X })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 1, start_vcol = 310, end_row = 1, end_vcol = X }
+        )
       )
       eq(
         { all = 0, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 311, end_row = 1, end_vcol = X })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 1, start_vcol = 311, end_row = 1, end_vcol = X }
+        )
       )
       eq(
         { all = 1, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 86, end_row = 1, end_vcol = 131 })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 1, start_vcol = 86, end_row = 1, end_vcol = 131 }
+        )
       )
       eq(
         { all = 1, fill = 0 },
-        meths.win_text_height(0, { start_row = 1, start_vcol = 221, end_row = 1, end_vcol = 266 })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 1, start_vcol = 221, end_row = 1, end_vcol = 266 }
+        )
       )
-      eq({ all = 18, fill = 0 }, meths.win_text_height(0, { start_row = 0, start_vcol = 131 }))
-      eq({ all = 19, fill = 0 }, meths.win_text_height(0, { start_row = 0, start_vcol = 130 }))
-      eq({ all = 20, fill = 0 }, meths.win_text_height(0, { end_row = 2, end_vcol = 311 }))
-      eq({ all = 21, fill = 0 }, meths.win_text_height(0, { end_row = 2, end_vcol = 312 }))
+      eq({ all = 18, fill = 0 }, meths.nvim_win_text_height(0, { start_row = 0, start_vcol = 131 }))
+      eq({ all = 19, fill = 0 }, meths.nvim_win_text_height(0, { start_row = 0, start_vcol = 130 }))
+      eq({ all = 20, fill = 0 }, meths.nvim_win_text_height(0, { end_row = 2, end_vcol = 311 }))
+      eq({ all = 21, fill = 0 }, meths.nvim_win_text_height(0, { end_row = 2, end_vcol = 312 }))
       eq(
         { all = 17, fill = 0 },
-        meths.win_text_height(0, { start_row = 0, start_vcol = 131, end_row = 2, end_vcol = 311 })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 0, start_vcol = 131, end_row = 2, end_vcol = 311 }
+        )
       )
       eq(
         { all = 19, fill = 0 },
-        meths.win_text_height(0, { start_row = 0, start_vcol = 130, end_row = 2, end_vcol = 312 })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 0, start_vcol = 130, end_row = 2, end_vcol = 312 }
+        )
       )
-      eq({ all = 16, fill = 0 }, meths.win_text_height(0, { start_row = 0, start_vcol = 221 }))
-      eq({ all = 17, fill = 0 }, meths.win_text_height(0, { start_row = 0, start_vcol = 220 }))
-      eq({ all = 14, fill = 0 }, meths.win_text_height(0, { end_row = 2, end_vcol = 41 }))
-      eq({ all = 15, fill = 0 }, meths.win_text_height(0, { end_row = 2, end_vcol = 42 }))
+      eq({ all = 16, fill = 0 }, meths.nvim_win_text_height(0, { start_row = 0, start_vcol = 221 }))
+      eq({ all = 17, fill = 0 }, meths.nvim_win_text_height(0, { start_row = 0, start_vcol = 220 }))
+      eq({ all = 14, fill = 0 }, meths.nvim_win_text_height(0, { end_row = 2, end_vcol = 41 }))
+      eq({ all = 15, fill = 0 }, meths.nvim_win_text_height(0, { end_row = 2, end_vcol = 42 }))
       eq(
         { all = 9, fill = 0 },
-        meths.win_text_height(0, { start_row = 0, start_vcol = 221, end_row = 2, end_vcol = 41 })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 0, start_vcol = 221, end_row = 2, end_vcol = 41 }
+        )
       )
       eq(
         { all = 11, fill = 0 },
-        meths.win_text_height(0, { start_row = 0, start_vcol = 220, end_row = 2, end_vcol = 42 })
+        meths.nvim_win_text_height(
+          0,
+          { start_row = 0, start_vcol = 220, end_row = 2, end_vcol = 42 }
+        )
       )
     end)
   end)
@@ -1012,7 +1072,7 @@ describe('API/win', function()
   describe('open_win', function()
     it('noautocmd option works', function()
       command('autocmd BufEnter,BufLeave,BufWinEnter * let g:fired = 1')
-      meths.open_win(meths.create_buf(true, true), true, {
+      meths.nvim_open_win(meths.nvim_create_buf(true, true), true, {
         relative = 'win',
         row = 3,
         col = 3,
@@ -1021,7 +1081,7 @@ describe('API/win', function()
         noautocmd = true,
       })
       eq(0, funcs.exists('g:fired'))
-      meths.open_win(meths.create_buf(true, true), true, {
+      meths.nvim_open_win(meths.nvim_create_buf(true, true), true, {
         relative = 'win',
         row = 3,
         col = 3,
@@ -1032,11 +1092,11 @@ describe('API/win', function()
     end)
 
     it('disallowed in cmdwin if enter=true or buf=curbuf', function()
-      local new_buf = meths.create_buf(true, true)
+      local new_buf = meths.nvim_create_buf(true, true)
       feed('q:')
       eq(
         'E11: Invalid in command-line window; <CR> executes, CTRL-C quits',
-        pcall_err(meths.open_win, new_buf, true, {
+        pcall_err(meths.nvim_open_win, new_buf, true, {
           relative = 'editor',
           row = 5,
           col = 5,
@@ -1046,7 +1106,7 @@ describe('API/win', function()
       )
       eq(
         'E11: Invalid in command-line window; <CR> executes, CTRL-C quits',
-        pcall_err(meths.open_win, 0, false, {
+        pcall_err(meths.nvim_open_win, 0, false, {
           relative = 'editor',
           row = 5,
           col = 5,
@@ -1057,7 +1117,7 @@ describe('API/win', function()
 
       eq(
         new_buf,
-        meths.win_get_buf(meths.open_win(new_buf, false, {
+        meths.nvim_win_get_buf(meths.nvim_open_win(new_buf, false, {
           relative = 'editor',
           row = 5,
           col = 5,
@@ -1068,10 +1128,10 @@ describe('API/win', function()
     end)
 
     it('aborts if buffer is invalid', function()
-      local wins_before = meths.list_wins()
+      local wins_before = meths.nvim_list_wins()
       eq(
         'Invalid buffer id: 1337',
-        pcall_err(meths.open_win, 1337, false, {
+        pcall_err(meths.nvim_open_win, 1337, false, {
           relative = 'editor',
           row = 5,
           col = 5,
@@ -1079,14 +1139,14 @@ describe('API/win', function()
           height = 5,
         })
       )
-      eq(wins_before, meths.list_wins())
+      eq(wins_before, meths.nvim_list_wins())
     end)
   end)
 
   describe('get_config', function()
     it('includes border', function()
       local b = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h' }
-      local win = meths.open_win(0, true, {
+      local win = meths.nvim_open_win(0, true, {
         relative = 'win',
         row = 3,
         col = 3,
@@ -1095,7 +1155,7 @@ describe('API/win', function()
         border = b,
       })
 
-      local cfg = meths.win_get_config(win)
+      local cfg = meths.nvim_win_get_config(win)
       eq(b, cfg.border)
     end)
 
@@ -1110,7 +1170,7 @@ describe('API/win', function()
         { 'g', 'Constant' },
         { 'h', 'PreProc' },
       }
-      local win = meths.open_win(0, true, {
+      local win = meths.nvim_open_win(0, true, {
         relative = 'win',
         row = 3,
         col = 3,
@@ -1119,14 +1179,14 @@ describe('API/win', function()
         border = b,
       })
 
-      local cfg = meths.win_get_config(win)
+      local cfg = meths.nvim_win_get_config(win)
       eq(b, cfg.border)
     end)
 
     it('includes title and footer', function()
       local title = { { 'A', { 'StatusLine', 'TabLine' } }, { 'B' }, { 'C', 'WinBar' } }
       local footer = { { 'A', 'WinBar' }, { 'B' }, { 'C', { 'StatusLine', 'TabLine' } } }
-      local win = meths.open_win(0, true, {
+      local win = meths.nvim_open_win(0, true, {
         relative = 'win',
         row = 3,
         col = 3,
@@ -1137,7 +1197,7 @@ describe('API/win', function()
         footer = footer,
       })
 
-      local cfg = meths.win_get_config(win)
+      local cfg = meths.nvim_win_get_config(win)
       eq(title, cfg.title)
       eq(footer, cfg.footer)
     end)
@@ -1145,7 +1205,7 @@ describe('API/win', function()
 
   describe('set_config', function()
     it('no crash with invalid title', function()
-      local win = meths.open_win(0, true, {
+      local win = meths.nvim_open_win(0, true, {
         width = 10,
         height = 10,
         relative = 'editor',
@@ -1156,14 +1216,14 @@ describe('API/win', function()
       })
       eq(
         'title/footer cannot be an empty array',
-        pcall_err(meths.win_set_config, win, { title = {} })
+        pcall_err(meths.nvim_win_set_config, win, { title = {} })
       )
       command('redraw!')
       assert_alive()
     end)
 
     it('no crash with invalid footer', function()
-      local win = meths.open_win(0, true, {
+      local win = meths.nvim_open_win(0, true, {
         width = 10,
         height = 10,
         relative = 'editor',
@@ -1174,7 +1234,7 @@ describe('API/win', function()
       })
       eq(
         'title/footer cannot be an empty array',
-        pcall_err(meths.win_set_config, win, { footer = {} })
+        pcall_err(meths.nvim_win_set_config, win, { footer = {} })
       )
       command('redraw!')
       assert_alive()