1 files changed, 28 insertions, 28 deletions
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 0a2fd18db2..6b30c0e81c 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -117,47 +117,47 @@ describe('vim_* functions', function()
     end)
   end)
 
-  describe('{get,set}_current_buffer and get_buffers', function()
+  describe('{get,set}_current_buf and list_bufs', function()
     it('works', function()
-      eq(1, #nvim('get_buffers'))
-      eq(nvim('get_buffers')[1], nvim('get_current_buffer'))
+      eq(1, #nvim('list_bufs'))
+      eq(nvim('list_bufs')[1], nvim('get_current_buf'))
       nvim('command', 'new')
-      eq(2, #nvim('get_buffers'))
-      eq(nvim('get_buffers')[2], nvim('get_current_buffer'))
-      nvim('set_current_buffer', nvim('get_buffers')[1])
-      eq(nvim('get_buffers')[1], nvim('get_current_buffer'))
+      eq(2, #nvim('list_bufs'))
+      eq(nvim('list_bufs')[2], nvim('get_current_buf'))
+      nvim('set_current_buf', nvim('list_bufs')[1])
+      eq(nvim('list_bufs')[1], nvim('get_current_buf'))
     end)
   end)
 
-  describe('{get,set}_current_window and get_windows', function()
+  describe('{get,set}_current_win and list_wins', function()
     it('works', function()
-      eq(1, #nvim('get_windows'))
-      eq(nvim('get_windows')[1], nvim('get_current_window'))
+      eq(1, #nvim('list_wins'))
+      eq(nvim('list_wins')[1], nvim('get_current_win'))
       nvim('command', 'vsplit')
       nvim('command', 'split')
-      eq(3, #nvim('get_windows'))
-      eq(nvim('get_windows')[1], nvim('get_current_window'))
-      nvim('set_current_window', nvim('get_windows')[2])
-      eq(nvim('get_windows')[2], nvim('get_current_window'))
+      eq(3, #nvim('list_wins'))
+      eq(nvim('list_wins')[1], nvim('get_current_win'))
+      nvim('set_current_win', nvim('list_wins')[2])
+      eq(nvim('list_wins')[2], nvim('get_current_win'))
     end)
   end)
 
-  describe('{get,set}_current_tabpage and get_tabpages', function()
+  describe('{get,set}_current_tabpage and list_tabpages', function()
     it('works', function()
-      eq(1, #nvim('get_tabpages'))
-      eq(nvim('get_tabpages')[1], nvim('get_current_tabpage'))
+      eq(1, #nvim('list_tabpages'))
+      eq(nvim('list_tabpages')[1], nvim('get_current_tabpage'))
       nvim('command', 'tabnew')
-      eq(2, #nvim('get_tabpages'))
-      eq(2, #nvim('get_windows'))
-      eq(nvim('get_windows')[2], nvim('get_current_window'))
-      eq(nvim('get_tabpages')[2], nvim('get_current_tabpage'))
-      nvim('set_current_window', nvim('get_windows')[1])
+      eq(2, #nvim('list_tabpages'))
+      eq(2, #nvim('list_wins'))
+      eq(nvim('list_wins')[2], nvim('get_current_win'))
+      eq(nvim('list_tabpages')[2], nvim('get_current_tabpage'))
+      nvim('set_current_win', nvim('list_wins')[1])
       -- Switching window also switches tabpages if necessary
-      eq(nvim('get_tabpages')[1], nvim('get_current_tabpage'))
-      eq(nvim('get_windows')[1], nvim('get_current_window'))
-      nvim('set_current_tabpage', nvim('get_tabpages')[2])
-      eq(nvim('get_tabpages')[2], nvim('get_current_tabpage'))
-      eq(nvim('get_windows')[2], nvim('get_current_window'))
+      eq(nvim('list_tabpages')[1], nvim('get_current_tabpage'))
+      eq(nvim('list_wins')[1], nvim('get_current_win'))
+      nvim('set_current_tabpage', nvim('list_tabpages')[2])
+      eq(nvim('list_tabpages')[2], nvim('get_current_tabpage'))
+      eq(nvim('list_wins')[2], nvim('get_current_win'))
     end)
   end)
 
@@ -305,7 +305,7 @@ describe('vim_* functions', function()
   end)
 
   it("doesn't leak memory on incorrect argument types", function()
-    local status, err = pcall(nvim, 'change_directory',{'not', 'a', 'dir'})
+    local status, err = pcall(nvim, 'set_current_dir',{'not', 'a', 'dir'})
     eq(false, status)
     ok(err:match(': Wrong type for argument 1, expecting String') ~= nil)
   end)