1 files changed, 22 insertions, 22 deletions
diff --git a/test/functional/editor/macro_spec.lua b/test/functional/editor/macro_spec.lua
index 1d2df8ce70..c97befdf07 100644
--- a/test/functional/editor/macro_spec.lua
+++ b/test/functional/editor/macro_spec.lua
@@ -6,8 +6,8 @@ local feed = helpers.feed
 local clear = helpers.clear
 local expect = helpers.expect
 local command = helpers.command
-local funcs = helpers.funcs
-local meths = helpers.meths
+local fn = helpers.fn
+local api = helpers.api
 local insert = helpers.insert
 
 describe('macros', function()
@@ -40,18 +40,18 @@ hello]]
     feed [[gg]]
 
     feed [[qqAFOO<esc>q]]
-    eq({ 'helloFOO', 'hello', 'hello' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'helloFOO', 'hello', 'hello' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[Q]]
-    eq({ 'helloFOOFOO', 'hello', 'hello' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'helloFOOFOO', 'hello', 'hello' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[G3Q]]
-    eq({ 'helloFOOFOO', 'hello', 'helloFOOFOOFOO' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'helloFOOFOO', 'hello', 'helloFOOFOOFOO' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[ggV3jQ]]
     eq(
       { 'helloFOOFOOFOO', 'helloFOO', 'helloFOOFOOFOOFOO' },
-      meths.nvim_buf_get_lines(0, 0, -1, false)
+      api.nvim_buf_get_lines(0, 0, -1, false)
     )
   end)
 
@@ -62,18 +62,18 @@ hello]]
     feed [[gg]]
 
     feed [[qqAFOO<esc>q]]
-    eq({ 'helloFOO', 'hello', 'hello' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'helloFOO', 'hello', 'hello' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[Q]]
-    eq({ 'helloFOOFOO', 'hello', 'hello' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'helloFOOFOO', 'hello', 'hello' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[G3@@]]
-    eq({ 'helloFOOFOO', 'hello', 'helloFOOFOOFOO' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'helloFOOFOO', 'hello', 'helloFOOFOOFOO' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[ggV2j@@]]
     eq(
       { 'helloFOOFOOFOO', 'helloFOO', 'helloFOOFOOFOOFOO' },
-      meths.nvim_buf_get_lines(0, 0, -1, false)
+      api.nvim_buf_get_lines(0, 0, -1, false)
     )
   end)
 
@@ -84,17 +84,17 @@ hello]]
     feed [[gg]]
 
     feed [[qqAFOO<esc>qu]]
-    eq({ 'hello', 'hello', 'hello' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'hello', 'hello', 'hello' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[qwA123<esc>qu]]
-    eq({ 'hello', 'hello', 'hello' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'hello', 'hello', 'hello' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[V3j@q]]
-    eq({ 'helloFOO', 'helloFOO', 'helloFOO' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'helloFOO', 'helloFOO', 'helloFOO' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[gg]]
     feed [[Vj@w]]
-    eq({ 'helloFOO123', 'helloFOO123', 'helloFOO' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'helloFOO123', 'helloFOO123', 'helloFOO' }, api.nvim_buf_get_lines(0, 0, -1, false))
   end)
 
   it('can be replayed with @q and @w visual-block', function()
@@ -104,17 +104,17 @@ hello]]
     feed [[gg]]
 
     feed [[qqAFOO<esc>qu]]
-    eq({ 'hello', 'hello', 'hello' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'hello', 'hello', 'hello' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[qwA123<esc>qu]]
-    eq({ 'hello', 'hello', 'hello' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'hello', 'hello', 'hello' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[<C-v>3j@q]]
-    eq({ 'helloFOO', 'helloFOO', 'helloFOO' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'helloFOO', 'helloFOO', 'helloFOO' }, api.nvim_buf_get_lines(0, 0, -1, false))
 
     feed [[gg]]
     feed [[<C-v>j@w]]
-    eq({ 'helloFOO123', 'helloFOO123', 'helloFOO' }, meths.nvim_buf_get_lines(0, 0, -1, false))
+    eq({ 'helloFOO123', 'helloFOO123', 'helloFOO' }, api.nvim_buf_get_lines(0, 0, -1, false))
   end)
 end)
 
@@ -127,13 +127,13 @@ describe('immediately after a macro has finished executing,', function()
   describe('reg_executing() from RPC returns an empty string', function()
     it('if the macro does not end with a <Nop> mapping', function()
       feed('@a')
-      eq('', funcs.reg_executing())
+      eq('', fn.reg_executing())
     end)
 
     it('if the macro ends with a <Nop> mapping', function()
       command('nnoremap 0 <Nop>')
       feed('@a')
-      eq('', funcs.reg_executing())
+      eq('', fn.reg_executing())
     end)
   end)
 
@@ -144,7 +144,7 @@ describe('immediately after a macro has finished executing,', function()
 
     it('if the macro does not end with a <Nop> mapping', function()
       feed('@asq') -- "q" from "s" mapping should start recording a macro instead of being no-op
-      eq({ mode = 'n', blocking = false }, meths.nvim_get_mode())
+      eq({ mode = 'n', blocking = false }, api.nvim_get_mode())
       expect('')
       eq('', eval('@a'))
     end)
@@ -152,7 +152,7 @@ describe('immediately after a macro has finished executing,', function()
     it('if the macro ends with a <Nop> mapping', function()
       command('nnoremap 0 <Nop>')
       feed('@asq') -- "q" from "s" mapping should start recording a macro instead of being no-op
-      eq({ mode = 'n', blocking = false }, meths.nvim_get_mode())
+      eq({ mode = 'n', blocking = false }, api.nvim_get_mode())
       expect('')
       eq('', eval('@a'))
     end)