diff --git a/README.md b/README.md
index 63a40f08..71bede92 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,8 @@
-<p align="center">
-  <img width="300" alt="Windsurf" src="windsurf.png"/>
-</p>
-
----
-
-[![Discord](https://img.shields.io/discord/1027685395649015980?label=community&color=5865F2&logo=discord&logoColor=FFFFFF)](https://discord.gg/3XFf78nAx5)
-[![Twitter Follow](https://img.shields.io/badge/style--blue?style=social&logo=twitter&label=Follow%20%40windsurf_ai)](https://twitter.com/intent/follow?screen_name=windsurf_ai)
-![License](https://img.shields.io/github/license/Exafunction/windsurf.vim)
-[![Docs](https://img.shields.io/badge/Windsurf%20Docs-09B6A2)](https://docs.windsurf.com)
-[![Canny Board](https://img.shields.io/badge/Feature%20Requests-6b69ff)](https://windsurf.canny.io/feature-requests/)
-[![built with Windsurf](https://windsurf.com/badges/main)](https://windsurf.com?repo_name=exafunction%2Fwindsurf.vim)
-
-[![Visual Studio](https://img.shields.io/visual-studio-marketplace/i/Codeium.codeium?label=Visual%20Studio&logo=visualstudio)](https://marketplace.visualstudio.com/items?itemName=Codeium.codeium)
-[![JetBrains](https://img.shields.io/jetbrains/plugin/d/20540?label=JetBrains)](https://plugins.jetbrains.com/plugin/20540-codeium/)
-[![Open VSX](https://img.shields.io/open-vsx/dt/Codeium/codeium?label=Open%20VSX)](https://open-vsx.org/extension/Codeium/codeium)
-[![Google Chrome](https://img.shields.io/chrome-web-store/users/hobjkcpmjhlegmobgonaagepfckjkceh?label=Google%20Chrome&logo=googlechrome&logoColor=FFFFFF)](https://chrome.google.com/webstore/detail/codeium/hobjkcpmjhlegmobgonaagepfckjkceh)
-
-# windsurf.vim
+# Gemini.vim
 
 _Free, ultrafast Copilot alternative for Vim and Neovim_
 
-Windsurf autocompletes your code with AI in all major IDEs. We [launched](https://www.windsurf.com/blog/codeium-copilot-alternative-in-vim) this implementation of the Windsurf plugin for Vim and Neovim to bring this modern coding superpower to more developers. Check out our [playground](https://www.windsurf.com/playground) if you want to quickly try out Windsurf online.
+Gemini autocompletes your code with AI in all major IDEs. We [launched](https://www.windsurf.com/blog/codeium-copilot-alternative-in-vim) this implementation of the Gemini plugin for Vim and Neovim to bring this modern coding superpower to more developers. Check out our [playground](https://www.windsurf.com/playground) if you want to quickly try out Gemini online.
 
 Contributions are welcome! Feel free to submit pull requests and issues related to the plugin.
 
@@ -35,57 +17,57 @@ Contributions are welcome! Feel free to submit pull requests and issues related
 1. Install [Vim](https://github.com/vim/vim) (at least 9.0.0185) or [Neovim](https://github.com/neovim/neovim/releases/latest) (at
    least 0.6)
 
-2. Install `Exafunction/windsurf.vim` using your vim plugin manager of
+2. Install `Exafunction/gemini.vim` using your vim plugin manager of
    choice, or manually. See [Installation Options](#-installation-options) below.
 
-3. Run `:Codeium Auth` to set up the plugin and start using Windsurf.
+3. Run `:Gemini Auth` to set up the plugin and start using Gemini.
 
-You can run `:help codeium` for a full list of commands and configuration
-options, or see [this guide](https://www.windsurf.com/vim_tutorial) for a quick tutorial on how to use Windsurf.
+You can run `:help gemini` for a full list of commands and configuration
+options, or see [this guide](https://www.gemini.com/vim_tutorial) for a quick tutorial on how to use Gemini.
 
 ## 🛠️ Configuration
 
-For a full list of configuration options you can run `:help codeium`.
+For a full list of configuration options you can run `:help gemini`.
 A few of the most popular options are highlighted below.
 
 ### ⌨️ Keybindings
 
-Windsurf provides the following functions to control suggestions:
+Gemini provides the following functions to control suggestions:
 
 | Action                       | Function                       | Default Binding |
 | ---------------------------  | ------------------------------ | --------------- |
-| Clear current suggestion     | `codeium#Clear()`              | `<C-]>`         |
-| Next suggestion              | `codeium#CycleCompletions(1)`  | `<M-]>`         |
-| Previous suggestion          | `codeium#CycleCompletions(-1)` | `<M-[>`         |
-| Insert suggestion            | `codeium#Accept()`             | `<Tab>`         |
-| Manually trigger suggestion  | `codeium#Complete()`           | `<M-Bslash>`    |
-| Accept word from suggestion  | `codeium#AcceptNextWord()`     | `<C-k>`         |
-| Accept line from suggestion  | `codeium#AcceptNextLine()`     | `<C-l>`         |
+| Clear current suggestion     | `gemini#Clear()`              | `<C-]>`         |
+| Next suggestion              | `gemini#CycleCompletions(1)`  | `<M-]>`         |
+| Previous suggestion          | `gemini#CycleCompletions(-1)` | `<M-[>`         |
+| Insert suggestion            | `gemini#Accept()`             | `<Tab>`         |
+| Manually trigger suggestion  | `gemini#Complete()`           | `<M-Bslash>`    |
+| Accept word from suggestion  | `gemini#AcceptNextWord()`     | `<C-k>`         |
+| Accept line from suggestion  | `gemini#AcceptNextLine()`     | `<C-l>`         |
 
-Windsurf's default keybindings can be disabled by setting
+Gemini's default keybindings can be disabled by setting
 
 ```vim
-let g:codeium_disable_bindings = 1
+let g:gemini_disable_bindings = 1
 ```
 
 or in Neovim:
 
 ```lua
-vim.g.codeium_disable_bindings = 1
+vim.g.gemini_disable_bindings = 1
 ```
 
 If you'd like to just disable the `<Tab>` binding, you can alternatively
-use the `g:codeium_no_map_tab` option.
+use the `g:gemini_no_map_tab` option.
 
 If you'd like to bind the actions above to different keys, this might look something like the following in Vim:
 
 ```vim
-imap <script><silent><nowait><expr> <C-g> codeium#Accept()
-imap <script><silent><nowait><expr> <C-h> codeium#AcceptNextWord()
-imap <script><silent><nowait><expr> <C-j> codeium#AcceptNextLine()
-imap <C-;>   <Cmd>call codeium#CycleCompletions(1)<CR>
-imap <C-,>   <Cmd>call codeium#CycleCompletions(-1)<CR>
-imap <C-x>   <Cmd>call codeium#Clear()<CR>
+imap <script><silent><nowait><expr> <C-g> gemini#Accept()
+imap <script><silent><nowait><expr> <C-h> gemini#AcceptNextWord()
+imap <script><silent><nowait><expr> <C-j> gemini#AcceptNextLine()
+imap <C-;>   <Cmd>call gemini#CycleCompletions(1)<CR>
+imap <C-,>   <Cmd>call gemini#CycleCompletions(-1)<CR>
+imap <C-x>   <Cmd>call gemini#Clear()<CR>
 ```
 
 Or in Neovim (using [wbthomason/packer.nvim](https://github.com/wbthomason/packer.nvim#specifying-plugins) or [folke/lazy.nvim](https://github.com/folke/lazy.nvim)):
@@ -93,54 +75,54 @@ Or in Neovim (using [wbthomason/packer.nvim](https://github.com/wbthomason/packe
 ```lua
 -- Remove the `use` here if you're using folke/lazy.nvim.
 use {
-  'Exafunction/windsurf.vim',
+  'Exafunction/gemini.vim',
   config = function ()
     -- Change '<C-g>' here to any keycode you like.
-    vim.keymap.set('i', '<C-g>', function () return vim.fn['codeium#Accept']() end, { expr = true, silent = true })
-    vim.keymap.set('i', '<c-;>', function() return vim.fn['codeium#CycleCompletions'](1) end, { expr = true, silent = true })
-    vim.keymap.set('i', '<c-,>', function() return vim.fn['codeium#CycleCompletions'](-1) end, { expr = true, silent = true })
-    vim.keymap.set('i', '<c-x>', function() return vim.fn['codeium#Clear']() end, { expr = true, silent = true })
+    vim.keymap.set('i', '<C-g>', function () return vim.fn['gemini#Accept']() end, { expr = true, silent = true })
+    vim.keymap.set('i', '<c-;>', function() return vim.fn['gemini#CycleCompletions'](1) end, { expr = true, silent = true })
+    vim.keymap.set('i', '<c-,>', function() return vim.fn['gemini#CycleCompletions'](-1) end, { expr = true, silent = true })
+    vim.keymap.set('i', '<c-x>', function() return vim.fn['gemini#Clear']() end, { expr = true, silent = true })
   end
 }
 ```
 
-(Make sure that you ran `:Codeium Auth` after installation.)
+(Make sure that you ran `:Gemini Auth` after installation.)
 
-### ⛔ Disabling Windsurf
+### ⛔ Disabling Gemini
 
-Windsurf can be disabled for particular filetypes by setting the
-`g:codeium_filetypes` variable in your vim config file (vimrc/init.vim):
+Gemini can be disabled for particular filetypes by setting the
+`g:gemini_filetypes` variable in your vim config file (vimrc/init.vim):
 
 ```vim
-let g:codeium_filetypes = {
+let g:gemini_filetypes = {
     \ "bash": v:false,
     \ "typescript": v:true,
     \ }
 ```
 
-Windsurf is enabled by default for most filetypes.
+Gemini is enabled by default for most filetypes.
 
-You can also _disable_ codeium by default with the `g:codeium_enabled` variable,
-and enable it manually per buffer by running `:CodeiumEnable`:
+You can also _disable_ gemini by default with the `g:gemini_enabled` variable,
+and enable it manually per buffer by running `:GeminiEnable`:
 
 ```vim
-let g:codeium_enabled = v:false
+let g:gemini_enabled = v:false
 ```
 
 or in Neovim:
 
 ```lua
-vim.g.codeium_enabled = false
+vim.g.gemini_enabled = false
 ```
 
-Or you can disable codeium for _all filetypes_ with the `g:codeium_filetypes_disabled_by_default` variable,
-and use the `g:codeium_filetypes` variable to selectively enable codeium for specified filetypes:
+Or you can disable gemini for _all filetypes_ with the `g:gemini_filetypes_disabled_by_default` variable,
+and use the `g:gemini_filetypes` variable to selectively enable gemini for specified filetypes:
 
 ```vim
-" let g:codeium_enabled = v:true
-let g:codeium_filetypes_disabled_by_default = v:true
+" let g:gemini_enabled = v:true
+let g:gemini_filetypes_disabled_by_default = v:true
 
-let g:codeium_filetypes = {
+let g:gemini_filetypes = {
     \ "rust": v:true,
     \ "typescript": v:true,
     \ }
@@ -149,57 +131,57 @@ let g:codeium_filetypes = {
 If you would like to just disable the automatic triggering of completions:
 
 ```vim
-let g:codeium_manual = v:true
+let g:gemini_manual = v:true
 
 " You might want to use `CycleOrComplete()` instead of `CycleCompletions(1)`.
 " This will make the forward cycling of suggestions also trigger the first
 " suggestion manually.
-imap <C-;> <Cmd>call codeium#CycleOrComplete()<CR>
+imap <C-;> <Cmd>call gemini#CycleOrComplete()<CR>
 ```
 
 To disable automatic text rendering of suggestions (the gray text that appears for a suggestion):
 
 ```vim
-let g:codeium_render = v:false
+let g:gemini_render = v:false
 ```
 
-### Show Windsurf status in statusline
+### Show Gemini status in statusline
 
-Windsurf status can be generated by calling the `codeium#GetStatusString()` function. In
-Neovim, you can use `vim.api.nvim_call_function("codeium#GetStatusString", {})` instead.
-It produces a 3 char long string with Windsurf status:
+Gemini status can be generated by calling the `gemini#GetStatusString()` function. In
+Neovim, you can use `vim.api.nvim_call_function("gemini#GetStatusString", {})` instead.
+It produces a 3 char long string with Gemini status:
 
 - `'3/8'` - third suggestion out of 8
-- `'0'` - Windsurf returned no suggestions
-- `'*'` - waiting for Windsurf response
+- `'0'` - Gemini returned no suggestions
+- `'*'` - waiting for Gemini response
 
-In normal mode, status shows if Windsurf is enabled or disabled by showing
+In normal mode, status shows if Gemini is enabled or disabled by showing
 `'ON'` or `'OFF'`.
 
 In order to show it in status line add following line to your `.vimrc`:
 
-```set statusline+=\{…\}%3{codeium#GetStatusString()}```
+```set statusline+=\{…\}%3{gemini#GetStatusString()}```
 
-Shorter variant without Windsurf logo:
+Shorter variant without Gemini logo:
 
-```set statusline+=%3{codeium#GetStatusString()}```
+```set statusline+=%3{gemini#GetStatusString()}```
 
 Please check `:help statusline` for further information about building statusline in VIM.
 
-vim-airline supports Windsurf out-of-the-box since commit [3854429d](https://github.com/vim-airline/vim-airline/commit/3854429d99c8a2fb555a9837b155f33c957a2202).
+vim-airline supports Gemini out-of-the-box since commit [3854429d](https://github.com/vim-airline/vim-airline/commit/3854429d99c8a2fb555a9837b155f33c957a2202).
 
-### Launching Windsurf Chat
+### Launching Gemini Chat
 
-Calling the `codeium#Chat()` function or using the `Codeium Chat` command will enable search and indexing in the current project and launch Codeium Chat in a new browser window.
+Calling the `gemini#Chat()` function or using the `Gemini Chat` command will enable search and indexing in the current project and launch Gemini Chat in a new browser window.
 
 ```vim
-:call codeium#Chat()
-:Codeium Chat
+:call gemini#Chat()
+:Gemini Chat
 ```
 
 The project root is determined by looking in Vim's current working directory for some specific files or directories to be present and goes up to parent directories until one is found.  This list of hints is user-configurable and the default value is:
 
-```let g:codeium_workspace_root_hints = ['.bzr','.git','.hg','.svn','_FOSSIL_','package.json']```
+```let g:gemini_workspace_root_hints = ['.bzr','.git','.hg','.svn','_FOSSIL_','package.json']```
 
 Note that launching chat enables telemetry.
 
@@ -209,7 +191,7 @@ Note that launching chat enables telemetry.
 
 ```lua
 {
-  'Exafunction/windsurf.vim',
+  'Exafunction/gemini.vim',
   event = 'BufEnter'
 }
 ```
@@ -217,19 +199,19 @@ Note that launching chat enables telemetry.
 ### 🔌 vim-plug
 
 ```vim
-Plug 'Exafunction/windsurf.vim', { 'branch': 'main' }
+Plug 'Exafunction/gemini.vim', { 'branch': 'main' }
 ```
 
 ### 📦 Vundle
 
 ```vim
-Plugin 'Exafunction/windsurf.vim'
+Plugin 'Exafunction/gemini.vim'
 ```
 
 ### 📦 packer.nvim:
 
 ```vim
-use 'Exafunction/windsurf.vim'
+use 'Exafunction/gemini.vim'
 ```
 
 ### 💪 Manual
@@ -240,7 +222,7 @@ Run the following. On windows, you can replace `~/.vim` with
 `$HOME/vimfiles`:
 
 ```bash
-git clone https://github.com/Exafunction/windsurf.vim ~/.vim/pack/Exafunction/start/windsurf.vim
+git clone https://github.com/Exafunction/gemini.vim ~/.vim/pack/Exafunction/start/gemini.vim
 ```
 
 #### 💻 Neovim
@@ -249,5 +231,5 @@ Run the following. On windows, you can replace `~/.config` with
 `$HOME/AppData/Local`:
 
 ```bash
-git clone https://github.com/Exafunction/windsurf.vim ~/.config/nvim/pack/Exafunction/start/windsurf.vim
+git clone https://github.com/Exafunction/gemini.vim ~/.config/nvim/pack/Exafunction/start/gemini.vim
 ```
diff --git a/autoload/codeium.vim b/autoload/codeium.vim
index 61789f38..f7ec51e3 100644
--- a/autoload/codeium.vim
+++ b/autoload/codeium.vim
@@ -83,7 +83,6 @@ function! s:CompletionInserter(current_completion, insert_text) abort
   else
     let cursor_text = "\<C-O>:exe 'go' line2byte(line('.'))+col('.')+(" . delta . ")\<CR>"
   endif
-  call codeium#server#Request('AcceptCompletion', {'metadata': codeium#server#RequestMetadata(), 'completion_id': current_completion.completion.completionId})
   return delete_range . insert_text . cursor_text
 endfunction
 
@@ -115,16 +114,30 @@ function! s:HandleCompletionsResult(out, err, status) abort
     let response_text = join(a:out, '')
     try
       let response = json_decode(response_text)
-      if get(response, 'code', v:null) isnot# v:null
-        call codeium#log#Error('Invalid response from language server')
-        call codeium#log#Error(response_text)
-        call codeium#log#Error('stderr: ' . join(a:err, ''))
-        call codeium#log#Exception()
+      let candidates = get(response, 'candidates', [])
+      if empty(candidates)
+        let b:_codeium_completions.items = []
+        let b:_codeium_completions.index = 0
+        let b:_codeium_status = 2
+        call s:RenderCurrentCompletion()
         return
       endif
-      let completionItems = get(response, 'completionItems', [])
-
-      let b:_codeium_completions.items = completionItems
+      let content = get(candidates[0], 'content', {})
+      let parts = get(content, 'parts', [])
+      if empty(parts)
+        let b:_codeium_completions.items = []
+        let b:_codeium_completions.index = 0
+        let b:_codeium_status = 2
+        call s:RenderCurrentCompletion()
+        return
+      endif
+      let text = get(parts[0], 'text', '')
+      let completionItem = {
+            \ 'completion': {
+            \   'text': text
+            \ }
+            \ }
+      let b:_codeium_completions.items = [completionItem]
       let b:_codeium_completions.index = 0
 
       let b:_codeium_status = 2
@@ -389,7 +402,7 @@ function! codeium#Complete(...) abort
 
   try
     let b:_codeium_status = 1
-    let request_job = codeium#server#Request('GetCompletions', data, function('s:HandleCompletionsResult', []))
+    let request_job = gemini#GetCompletions(data, function('s:HandleCompletionsResult', []))
 
     let b:_codeium_completions = {
           \ 'request_data': request_data,
diff --git a/autoload/codeium/command.vim b/autoload/codeium/command.vim
deleted file mode 100644
index e7350287..00000000
--- a/autoload/codeium/command.vim
+++ /dev/null
@@ -1,202 +0,0 @@
-function! codeium#command#BrowserCommand() abort
-  if has('win32') && executable('rundll32')
-    return 'rundll32 url.dll,FileProtocolHandler'
-  elseif isdirectory('/private') && executable('/usr/bin/open')
-    return '/usr/bin/open'
-  elseif executable('xdg-open')
-    return 'xdg-open'
-  else
-    return ''
-  endif
-endfunction
-
-function! codeium#command#XdgConfigDir() abort
-  let config_dir = $XDG_CONFIG_HOME
-  if empty(config_dir)
-    let config_dir = $HOME . '/.config'
-  endif
-  return config_dir . '/codeium'
-endfunction
-
-function! codeium#command#HomeDir() abort
-  let data_dir = $XDG_DATA_HOME
-  if empty(data_dir)
-    let data_dir = $HOME . '/.codeium'
-  else
-    let data_dir = data_dir . '/.codeium'
-  endif
-  return data_dir
-endfunction
-
-function! codeium#command#LoadConfig(dir) abort
-  let config_path = a:dir . '/config.json'
-  if filereadable(config_path)
-    let contents = join(readfile(config_path), '')
-    if !empty(contents)
-      return json_decode(contents)
-    endif
-  endif
-
-  return {}
-endfunction
-
-let s:api_key = get(codeium#command#LoadConfig(codeium#command#HomeDir()), 'apiKey', '')
-
-let s:commands = {}
-
-function! s:commands.Auth(...) abort
-  if !codeium#util#HasSupportedVersion()
-    if has('nvim')
-      let min_version = 'NeoVim 0.6'
-    else
-      let min_version = 'Vim 9.0.0185'
-    endif
-    echoerr 'This version of Vim is unsupported. Install ' . min_version . ' or greater to use Codeium.'
-    return
-  endif
-
-  let config = get(g:, 'codeium_server_config', {})
-  let portal_url = get(config, 'portal_url', 'https://www.codeium.com')
-
-  let url = portal_url . '/profile?response_type=token&redirect_uri=vim-show-auth-token&state=a&scope=openid%20profile%20email&redirect_parameters_type=query'
-  let browser = codeium#command#BrowserCommand()
-  let opened_browser = v:false
-  if !empty(browser)
-    echomsg 'Navigating to ' . url
-    try
-      call system(browser . ' ' . '"' . url . '"')
-      if v:shell_error is# 0
-        let opened_browser = v:true
-      endif
-    catch
-    endtry
-
-    if !opened_browser
-      echomsg 'Failed to open browser. Please go to the link above.'
-    endif
-  else
-    echomsg 'No available browser found. Please go to ' . url
-  endif
-
-  let api_key = ''
-  call inputsave()
-  let auth_token = inputsecret('Paste your token here: ')
-  call inputrestore()
-  let tries = 0
-
-  if has_key(config, 'api_url') && !empty(config.api_url)
-    let register_user_url = config.api_url . '/exa.seat_management_pb.SeatManagementService/RegisterUser'
-  else
-    let register_user_url = 'https://api.codeium.com/register_user/'
-  endif
-
-  while empty(api_key) && tries < 3
-    let command = 'curl -sSL ' . register_user_url . ' ' .
-          \ '--header "Content-Type: application/json" ' .
-          \ '--data ' . shellescape(json_encode({'firebase_id_token': auth_token}))
-    let response = system(command)
-    let curl_ssl_error = 'The revocation function was unable to check revocation '
-          \ . 'for the certificate.'
-    if has('win32') && response=~curl_ssl_error
-        call inputsave()
-        let useNoSsl = input('For Windows systems behind a corporate proxy there '
-              \ . 'may be trouble verifying the SSL certificates. '
-              \ . 'Would you like to try auth without checking SSL certificate revocation? (y/n): ')
-        call inputrestore()
-        if useNoSsl ==? 'y'
-            let command = 'curl --ssl-no-revoke -sSL ' . register_user_url . ' ' .
-                  \ '--header "Content-Type: application/json" ' .
-                  \ '--data ' . shellescape(json_encode({'firebase_id_token': auth_token}))
-            let response = system(command)
-        endif
-    endif
-    let res = json_decode(response)
-    let api_key = get(res, 'api_key', '')
-    if empty(api_key)
-      echomsg 'Unexpected response: ' . response
-      call inputsave()
-      let auth_token = inputsecret('Invalid token, please try again: ')
-      call inputrestore()
-    endif
-    let tries = tries + 1
-  endwhile
-
-  if !empty(api_key)
-    let s:api_key = api_key
-    let config_dir = codeium#command#HomeDir()
-    let config_path = config_dir . '/config.json'
-    let config = codeium#command#LoadConfig(config_dir)
-    let config.apiKey = api_key
-
-    try
-      call mkdir(config_dir, 'p')
-      call writefile([json_encode(config)], config_path)
-    catch
-      call codeium#log#Error('Could not persist api key to config.json')
-    endtry
-  endif
-endfunction
-
-function s:commands.Chat(...) abort
-  call codeium#Chat()
-endfunction
-
-function! s:commands.Disable(...) abort
-  let g:codeium_enabled = 0
-endfunction
-
-function! s:commands.DisableBuffer(...) abort
-  let b:codeium_enabled = 0
-endfunction
-
-" Run codeium server only if its not already started
-function! codeium#command#StartLanguageServer() abort
-  if !get(g:, 'codeium_server_started', v:false)
-    call timer_start(0, function('codeium#server#Start'))
-    let g:codeium_server_started = v:true
-  endif
-endfunction
-
-function! s:commands.Enable(...) abort
-  let g:codeium_enabled = 1
-  call codeium#command#StartLanguageServer()
-endfunction
-
-function! s:commands.EnableBuffer(...) abort
-  let b:codeium_enabled = 1
-  call codeium#command#StartLanguageServer()
-endfunction
-
-function! s:commands.Toggle(...) abort
-  if exists('g:codeium_enabled') && g:codeium_enabled == v:false
-      call s:commands.Enable()
-  else
-      call s:commands.Disable()
-  endif
-endfunction
-
-function! codeium#command#ApiKey() abort
-  if s:api_key == ''
-    echom 'Codeium: No API key found; maybe you need to run `:Codeium Auth`?'
-  endif
-  return s:api_key
-endfunction
-
-function! codeium#command#Complete(arg, lead, pos) abort
-  let args = matchstr(strpart(a:lead, 0, a:pos), 'C\%[odeium][! ] *\zs.*')
-  return sort(filter(keys(s:commands), { k -> strpart(k, 0, len(a:arg)) ==# a:arg }))
-endfunction
-
-function! codeium#command#Command(arg) abort
-  let cmd = matchstr(a:arg, '^\%(\\.\|\S\)\+')
-  let arg = matchstr(a:arg, '\s\zs\S.*')
-  if !has_key(s:commands, cmd)
-    return 'echoerr ' . string("Codeium: command '" . string(cmd) . "' not found")
-  endif
-  let res = s:commands[cmd](arg)
-  if type(res) == v:t_string
-    return res
-  else
-    return ''
-  endif
-endfunction
diff --git a/autoload/codeium/log.vim b/autoload/codeium/log.vim
deleted file mode 100644
index fe0a3ee9..00000000
--- a/autoload/codeium/log.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-if exists('g:loaded_codeium_log')
-  finish
-endif
-let g:loaded_codeium_log = 1
-
-if !exists('s:logfile')
-  let s:logfile = expand(get(g:, 'codeium_log_file', tempname() . '-codeium.log'))
-  try
-    call writefile([], s:logfile)
-  catch
-  endtry
-endif
-
-function! codeium#log#Logfile() abort
-  return s:logfile
-endfunction
-
-function! codeium#log#Log(level, msg) abort
-  let min_level = toupper(get(g:, 'codeium_log_level', 'WARN'))
-  " echo "logging to: " . s:logfile . "," . min_level . "," . a:level . "," a:msg
-  for level in ['ERROR', 'WARN', 'INFO', 'DEBUG', 'TRACE']
-    if level == toupper(a:level)
-      try
-        if filewritable(s:logfile)
-          call writefile(split(a:msg, "\n", 1), s:logfile, 'a')
-        endif
-      catch
-      endtry
-    endif
-    if level == min_level
-      break
-    endif
-  endfor
-endfunction
-
-function! codeium#log#Error(msg) abort
-  call codeium#log#Log('ERROR', a:msg)
-endfunction
-
-function! codeium#log#Warn(msg) abort
-  call codeium#log#Log('WARN', a:msg)
-endfunction
-
-function! codeium#log#Info(msg) abort
-  call codeium#log#Log('INFO', a:msg)
-endfunction
-
-function! codeium#log#Debug(msg) abort
-  call codeium#log#Log('DEBUG', a:msg)
-endfunction
-
-function! codeium#log#Trace(msg) abort
-  call codeium#log#Log('TRACE', a:msg)
-endfunction
-
-function! codeium#log#Exception() abort
-  if !empty(v:exception)
-    call codeium#log#Error('Exception: ' . v:exception . ' [' . v:throwpoint . ']')
-  endif
-endfunction
diff --git a/autoload/gemini.vim b/autoload/gemini.vim
new file mode 100644
index 00000000..48e95beb
--- /dev/null
+++ b/autoload/gemini.vim
@@ -0,0 +1,80 @@
+function! gemini#GetCompletions(data, ...) abort
+  let api_key = gemini#command#ApiKey()
+  if empty(api_key)
+    return
+  endif
+
+  let uri = 'https://generativelanguage.googleapis.com/v1beta/models/gemini-2.5-flash:generateContent'
+  let prompt = a:data.document.text
+
+  let request_body = {
+        \ 'contents': [
+        \   {
+        \     'parts': [
+        \       {
+        \         'text': prompt
+        \       }
+        \     ]
+        \   }
+        \ ]
+        \ }
+
+  let data = json_encode(request_body)
+
+  let args = [
+        \ 'curl', '-L', uri,
+        \ '--header', 'Content-Type: application/json',
+        \ '--header', 'x-goog-api-key: ' . api_key,
+        \ '-d@-'
+        \ ]
+
+  let result = {'out': [], 'err': []}
+  let ExitCallback = a:0 && !empty(a:1) ? a:1 : function('s:NoopCallback')
+  if has('nvim')
+    let jobid = jobstart(args, {
+                \ 'on_stdout': { channel, data, t -> add(result.out, join(data, "\n")) },
+                \ 'on_stderr': { channel, data, t -> add(result.err, join(data, "\n")) },
+                \ 'on_exit': { job, status, t -> ExitCallback(result.out, result.err, status) },
+                \ })
+    call chansend(jobid, data)
+    call chanclose(jobid, 'stdin')
+    return jobid
+  else
+    let job = job_start(args, {
+                \ 'in_mode': 'raw',
+                \ 'out_mode': 'raw',
+                \ 'out_cb': { channel, data -> add(result.out, data) },
+                \ 'err_cb': { channel, data -> add(result.err, data) },
+                \ 'exit_cb': { job, status -> s:OnExit(result, status, ExitCallback) },
+                \ 'close_cb': { channel -> s:OnClose(result, ExitCallback) }
+                \ })
+    let channel = job_getchannel(job)
+    call ch_sendraw(channel, data)
+    call ch_close_in(channel)
+    return job
+  endif
+endfunction
+
+function! s:OnExit(result, status, on_complete_cb) abort
+  let did_close = has_key(a:result, 'closed')
+  if did_close
+    call remove(a:result, 'closed')
+    call a:on_complete_cb(a:result.out, a:result.err, a:status)
+  else
+    " Wait until we receive OnClose, and call on_complete_cb then.
+    let a:result.exit_status = a:status
+  endif
+endfunction
+
+function! s:OnClose(result, on_complete_cb) abort
+  let did_exit = has_key(a:result, 'exit_status')
+  if did_exit
+    call a:on_complete_cb(a:result.out, a:result.err, a:result.exit_status)
+  else
+    " Wait until we receive OnClose, and call on_complete_cb then.
+    let a:result.closed = v:true
+  endif
+endfunction
+
+function! s:NoopCallback(...) abort
+endfunction
diff --git a/autoload/gemini/command.vim b/autoload/gemini/command.vim
new file mode 100644
index 00000000..7a02b724
--- /dev/null
+++ b/autoload/gemini/command.vim
@@ -0,0 +1,126 @@
+function! gemini#command#BrowserCommand() abort
+  if has('win32') && executable('rundll32')
+    return 'rundll32 url.dll,FileProtocolHandler'
+  elseif isdirectory('/private') && executable('/usr/bin/open')
+    return '/usr/bin/open'
+  elseif executable('xdg-open')
+    return 'xdg-open'
+  else
+    return ''
+  endif
+endfunction
+
+function! gemini#command#XdgConfigDir() abort
+  let config_dir = $XDG_CONFIG_HOME
+  if empty(config_dir)
+    let config_dir = $HOME . '/.config'
+  endif
+  return config_dir . '/gemini'
+endfunction
+
+function! gemini#command#HomeDir() abort
+  let data_dir = $XDG_DATA_HOME
+  if empty(data_dir)
+    let data_dir = $HOME . '/.gemini'
+  else
+    let data_dir = data_dir . '/.gemini'
+  endif
+  return data_dir
+endfunction
+
+function! gemini#command#LoadConfig(dir) abort
+  let config_path = a:dir . '/config.json'
+  if filereadable(config_path)
+    let contents = join(readfile(config_path), '')
+    if !empty(contents)
+      return json_decode(contents)
+    endif
+  endif
+
+  return {}
+endfunction
+
+let s:api_key = get(gemini#command#LoadConfig(gemini#command#HomeDir()), 'apiKey', '')
+
+let s:commands = {}
+
+function! s:commands.Auth(...) abort
+  call inputsave()
+  let api_key = inputsecret('Paste your Gemini API key here: ')
+  call inputrestore()
+
+  if !empty(api_key)
+    let s:api_key = api_key
+    let config_dir = gemini#command#HomeDir()
+    let config_path = config_dir . '/config.json'
+    let config = gemini#command#LoadConfig(config_dir)
+    let config.apiKey = api_key
+
+    try
+      call mkdir(config_dir, 'p')
+      call writefile([json_encode(config)], config_path)
+    catch
+      call gemini#log#Error('Could not persist api key to config.json')
+    endtry
+  endif
+endfunction
+
+function s:commands.Chat(...) abort
+  call gemini#Chat()
+endfunction
+
+function! s:commands.Disable(...) abort
+  let g:gemini_enabled = 0
+endfunction
+
+function! s:commands.DisableBuffer(...) abort
+  let b:gemini_enabled = 0
+endfunction
+
+" Run gemini server only if its not already started
+function! gemini#command#StartLanguageServer() abort
+endfunction
+
+function! s:commands.Enable(...) abort
+  let g:gemini_enabled = 1
+  call gemini#command#StartLanguageServer()
+endfunction
+
+function! s:commands.EnableBuffer(...) abort
+  let b:gemini_enabled = 1
+  call gemini#command#StartLanguageServer()
+endfunction
+
+function! s:commands.Toggle(...) abort
+  if exists('g:gemini_enabled') && g:gemini_enabled == v:false
+      call s:commands.Enable()
+  else
+      call s:commands.Disable()
+  endif
+endfunction
+
+function! gemini#command#ApiKey() abort
+  if s:api_key == ''
+    echom 'Gemini: No API key found; maybe you need to run `:Gemini Auth`?'
+  endif
+  return s:api_key
+endfunction
+
+function! gemini#command#Complete(arg, lead, pos) abort
+  let args = matchstr(strpart(a:lead, 0, a:pos), 'G\%[emini][! ] *\zs.*')
+  return sort(filter(keys(s:commands), { k -> strpart(k, 0, len(a:arg)) ==# a:arg }))
+endfunction
+
+function! gemini#command#Command(arg) abort
+  let cmd = matchstr(a:arg, '^\%(\\.\|\S\)\+')
+  let arg = matchstr(a:arg, '\s\zs\S.*')
+  if !has_key(s:commands, cmd)
+    return 'echoerr ' . string("Gemini: command '" . string(cmd) . "' not found")
+  endif
+  let res = s:commands[cmd](arg)
+  if type(res) == v:t_string
+    return res
+  else
+    return ''
+  endif
+endfunction
diff --git a/autoload/codeium/doc.vim b/autoload/gemini/doc.vim
similarity index 86%
rename from autoload/codeium/doc.vim
rename to autoload/gemini/doc.vim
index 8084d089..8312b197 100644
--- a/autoload/codeium/doc.vim
+++ b/autoload/gemini/doc.vim
@@ -85,7 +85,7 @@ let s:filetype_aliases = {
       \ 'text': 'plaintext',
       \ }
 
-function! codeium#doc#GetDocument(bufId, curLine, curCol) abort
+function! gemini#doc#GetDocument(bufId, curLine, curCol) abort
   let lines = getbufline(a:bufId, 1, '$')
   if getbufvar(a:bufId, '&endofline')
     call add(lines, '')
@@ -93,20 +93,20 @@ function! codeium#doc#GetDocument(bufId, curLine, curCol) abort
 
   let filetype = substitute(getbufvar(a:bufId, '&filetype'), '\..*', '', '')
   let language = get(s:filetype_aliases, empty(filetype) ? 'text' : filetype, filetype)
-  if empty(filetype) && get(g:, 'codeium_warn_filetype_missing', v:true)
-    call codeium#log#Warn('No filetype detected. This will affect completion quality.')
-    let g:codeium_warn_filetype_missing = v:false
+  if empty(filetype) && get(g:, 'gemini_warn_filetype_missing', v:true)
+    call gemini#log#Warn('No filetype detected. This will affect completion quality.')
+    let g:gemini_warn_filetype_missing = v:false
   endif
   let editor_language = empty(getbufvar(a:bufId, '&filetype')) ? 'unspecified' : getbufvar(a:bufId, '&filetype')
   let doc = {
-        \ 'text': join(lines, codeium#util#LineEndingChars()),
+        \ 'text': join(lines, gemini#util#LineEndingChars()),
         \ 'editor_language': editor_language,
         \ 'language': get(s:language_enum, language, 0),
         \ 'cursor_position': {'row': a:curLine - 1, 'col': a:curCol - 1},
         \ 'absolute_path_migrate_me_to_uri': fnamemodify(bufname(a:bufId), ':p'),
         \ }
 
-  let line_ending = codeium#util#LineEndingChars(v:null)
+  let line_ending = gemini#util#LineEndingChars(v:null)
   if line_ending isnot# v:null
     let doc.line_ending = line_ending
   endif
@@ -114,7 +114,7 @@ function! codeium#doc#GetDocument(bufId, curLine, curCol) abort
   return doc
 endfunction
 
-function! codeium#doc#GetEditorOptions() abort
+function! gemini#doc#GetEditorOptions() abort
   return {
       \ 'tab_size': shiftwidth(),
       \ 'insert_spaces': &expandtab ? v:true : v:false,
diff --git a/autoload/gemini/log.vim b/autoload/gemini/log.vim
new file mode 100644
index 00000000..0938e6a7
--- /dev/null
+++ b/autoload/gemini/log.vim
@@ -0,0 +1,60 @@
+if exists('g:loaded_gemini_log')
+  finish
+endif
+let g:loaded_gemini_log = 1
+
+if !exists('s:logfile')
+  let s:logfile = expand(get(g:, 'gemini_log_file', tempname() . '-gemini.log'))
+  try
+    call writefile([], s:logfile)
+  catch
+  endtry
+endif
+
+function! gemini#log#Logfile() abort
+  return s:logfile
+endfunction
+
+function! gemini#log#Log(level, msg) abort
+  let min_level = toupper(get(g:, 'gemini_log_level', 'WARN'))
+  " echo "logging to: " . s:logfile . "," . min_level . "," . a:level . "," a:msg
+  for level in ['ERROR', 'WARN', 'INFO', 'DEBUG', 'TRACE']
+    if level == toupper(a:level)
+      try
+        if filewritable(s:logfile)
+          call writefile(split(a:msg, "\n", 1), s:logfile, 'a')
+        endif
+      catch
+      endtry
+    endif
+    if level == min_level
+      break
+    endif
+  endfor
+endfunction
+
+function! gemini#log#Error(msg) abort
+  call gemini#log#Log('ERROR', a:msg)
+endfunction
+
+function! gemini#log#Warn(msg) abort
+  call gemini#log#Log('WARN', a:msg)
+endfunction
+
+function! gemini#log#Info(msg) abort
+  call gemini#log#Log('INFO', a:msg)
+endfunction
+
+function! gemini#log#Debug(msg) abort
+  call gemini#log#Log('DEBUG', a:msg)
+endfunction
+
+function! gemini#log#Trace(msg) abort
+  call gemini#log#Log('TRACE', a:msg)
+endfunction
+
+function! gemini#log#Exception() abort
+  if !empty(v:exception)
+    call gemini#log#Error('Exception: ' . v:exception . ' [' . v:throwpoint . ']')
+  endif
+endfunction
diff --git a/autoload/codeium/server.vim b/autoload/gemini/server.vim
similarity index 78%
rename from autoload/codeium/server.vim
rename to autoload/gemini/server.vim
index 2b33b952..6b82406c 100644
--- a/autoload/codeium/server.vim
+++ b/autoload/gemini/server.vim
@@ -25,11 +25,11 @@ if !exists('s:editor_version')
 endif
 
 let s:server_port = v:null
-if codeium#util#IsUsingRemoteChat()
+if gemini#util#IsUsingRemoteChat()
   let s:server_port = 42100
 endif
 
-let g:codeium_server_job = v:null
+let g:gemini_server_job = v:null
 
 function! s:DetectGlibcVersion() abort
   if !has('unix') || has('mac')
@@ -42,7 +42,7 @@ function! s:DetectGlibcVersion() abort
       if v:shell_error == 0
         let match = matchlist(ldd_output, 'ldd (GNU libc) \(\d\+\.\d\+\)')
         if !empty(match)
-          call codeium#log#Info('Detected glibc version via ldd: ' . match[1])
+          call gemini#log#Info('Detected glibc version via ldd: ' . match[1])
           return match[1]
         endif
       endif
@@ -54,7 +54,7 @@ function! s:DetectGlibcVersion() abort
       if v:shell_error == 0
         let match = matchlist(getconf_output, 'glibc \(\d\+\.\d\+\)')
         if !empty(match)
-          call codeium#log#Info('Detected glibc version via getconf: ' . match[1])
+          call gemini#log#Info('Detected glibc version via getconf: ' . match[1])
           return match[1]
         endif
       endif
@@ -66,17 +66,17 @@ function! s:DetectGlibcVersion() abort
       if v:shell_error == 0
         let match = matchlist(libc_output, 'GNU C Library.*release version \(\d\+\.\d\+\)')
         if !empty(match)
-          call codeium#log#Info('Detected glibc version via libc.so.6: ' . match[1])
+          call gemini#log#Info('Detected glibc version via libc.so.6: ' . match[1])
           return match[1]
         endif
       endif
     catch
     endtry
 
-    call codeium#log#Warn('Could not detect glibc version using any method')
+    call gemini#log#Warn('Could not detect glibc version using any method')
     return v:null
   catch
-    call codeium#log#Error('Error detecting glibc version: ' . v:exception)
+    call gemini#log#Error('Error detecting glibc version: ' . v:exception)
     return v:null
   endtry
 endfunction
@@ -134,9 +134,9 @@ endfunction
 function! s:NoopCallback(...) abort
 endfunction
 
-function! codeium#server#RequestMetadata() abort
+function! gemini#server#RequestMetadata() abort
   return {
-        \ 'api_key': codeium#command#ApiKey(),
+        \ 'api_key': gemini#command#ApiKey(),
         \ 'ide_name':  s:ide,
         \ 'ide_version':  s:ide_version,
         \ 'extension_name': 'vim',
@@ -144,7 +144,7 @@ function! codeium#server#RequestMetadata() abort
         \ }
 endfunction
 
-function! codeium#server#Request(type, data, ...) abort
+function! gemini#server#Request(type, data, ...) abort
   if s:server_port is# v:null
     throw 'Server port has not been properly initialized.'
   endif
@@ -188,7 +188,7 @@ function! s:FindPort(dir, timer) abort
   for name in readdir(a:dir)
     let path = a:dir . '/' . name
     if time - getftime(path) <= 5 && getftype(path) ==# 'file'
-      call codeium#log#Info('Found port: ' . name)
+      call gemini#log#Info('Found port: ' . name)
       let s:server_port = name
       call s:RequestServerStatus()
       call timer_stop(a:timer)
@@ -198,7 +198,7 @@ function! s:FindPort(dir, timer) abort
 endfunction
 
 function! s:RequestServerStatus() abort
-  call codeium#server#Request('GetStatus', {'metadata': codeium#server#RequestMetadata()}, function('s:HandleGetStatusResponse'))
+  call gemini#server#Request('GetStatus', {'metadata': gemini#server#RequestMetadata()}, function('s:HandleGetStatusResponse'))
 endfunction
 
 function! s:HandleGetStatusResponse(out, err, status) abort
@@ -213,28 +213,28 @@ function! s:HandleGetStatusResponse(out, err, status) abort
     endif
   else
     " Handle error if the status is not 0 or if there is stderr output
-    call codeium#log#Error(join(a:err, "\n"))
+    call gemini#log#Error(join(a:err, "\n"))
   endif
 endfunction
 
 function! s:SendHeartbeat(timer) abort
   try
-    call codeium#server#Request('Heartbeat', {'metadata': codeium#server#RequestMetadata()})
+    call gemini#server#Request('Heartbeat', {'metadata': gemini#server#RequestMetadata()})
   catch
-    call codeium#log#Exception()
+    call gemini#log#Exception()
   endtry
 endfunction
 
-function! codeium#server#Start(...) abort
-  let user_defined_codeium_bin = get(g:, 'codeium_bin', '')
+function! gemini#server#Start(...) abort
+  let user_defined_gemini_bin = get(g:, 'gemini_bin', '')
 
-  if user_defined_codeium_bin != '' && filereadable(user_defined_codeium_bin)
-    let s:bin = user_defined_codeium_bin
+  if user_defined_gemini_bin != '' && filereadable(user_defined_gemini_bin)
+    let s:bin = user_defined_gemini_bin
     call s:ActuallyStart()
     return
   endif
-  let user_defined_os = get(g:, 'codeium_os', '')
-  let user_defined_arch = get(g:, 'codeium_arch', '')
+  let user_defined_os = get(g:, 'gemini_os', '')
+  let user_defined_arch = get(g:, 'gemini_arch', '')
 
   if user_defined_os != '' && user_defined_arch != ''
     let os = user_defined_os
@@ -265,11 +265,11 @@ function! codeium#server#Start(...) abort
     let bin_suffix = 'windows_x64.exe'
   endif
 
-  let config = get(g:, 'codeium_server_config', {})
+  let config = get(g:, 'gemini_server_config', {})
   if has_key(config, 'portal_url') && !empty(config.portal_url)
     let has_old_glibc = s:IsGlibcVersionLessOrEqual('2.27')
     if has_old_glibc
-      call codeium#log#Info('Using legacy language server version 1.46.0 for enterprise customer with glibc <= 2.27')
+      call gemini#log#Info('Using legacy language server version 1.46.0 for enterprise customer with glibc <= 2.27')
       let s:language_server_version = '1.46.0'
       let s:language_server_sha = 'enterprise-' . s:language_server_version
     else
@@ -278,30 +278,30 @@ function! codeium#server#Start(...) abort
         let s:language_server_version = response
         let s:language_server_sha = 'enterprise-' . s:language_server_version
       else
-        call codeium#log#Error('Failed to fetch version from ' . config.portal_url)
-        call codeium#log#Error(v:shell_error)
+        call gemini#log#Error('Failed to fetch version from ' . config.portal_url)
+        call gemini#log#Error(v:shell_error)
       endif
     endif
   endif
 
-  let sha = get(codeium#command#LoadConfig(codeium#command#XdgConfigDir()), 'sha', s:language_server_sha)
-  let bin_dir = codeium#command#HomeDir() . '/bin/' . sha
+  let sha = get(gemini#command#LoadConfig(gemini#command#XdgConfigDir()), 'sha', s:language_server_sha)
+  let bin_dir = gemini#command#HomeDir() . '/bin/' . sha
   let s:bin = bin_dir . '/language_server_' . bin_suffix
   call mkdir(bin_dir, 'p')
 
   if !filereadable(s:bin)
     call delete(s:bin)
     if sha ==# s:language_server_sha
-      let config = get(g:, 'codeium_server_config', {})
+      let config = get(g:, 'gemini_server_config', {})
       if has_key(config, 'portal_url') && !empty(config.portal_url)
         let base_url = config.portal_url
       else
-        let base_url = 'https://github.com/Exafunction/codeium/releases/download'
+        let base_url = 'https://github.com/Exafunction/gemini/releases/download'
       endif
       let base_url = substitute(base_url, '/\+$', '', '')
       let url = base_url . '/language-server-v' . s:language_server_version . '/language_server_' . bin_suffix . '.gz'
     else
-      let url = 'https://storage.googleapis.com/exafunction-dist/codeium/' . sha . '/language_server_' . bin_suffix . '.gz'
+      let url = 'https://storage.googleapis.com/exafunction-dist/gemini/' . sha . '/language_server_' . bin_suffix . '.gz'
     endif
     let args = ['curl', '-Lo', s:bin . '.gz', url]
     if has('nvim')
@@ -339,39 +339,39 @@ function! s:UnzipAndStart(status) abort
     let &shellredir = old_shellredir
   else
     if !executable('gzip')
-      call codeium#log#Error('Failed to extract language server binary: missing `gzip`.')
+      call gemini#log#Error('Failed to extract language server binary: missing `gzip`.')
       return ''
     endif
     call system('gzip -d ' . s:bin . '.gz')
     call system('chmod +x ' . s:bin)
   endif
   if !filereadable(s:bin)
-    call codeium#log#Error('Failed to download language server binary.')
+    call gemini#log#Error('Failed to download language server binary.')
     return ''
   endif
   call s:ActuallyStart()
 endfunction
 
 function! s:ActuallyStart() abort
-  let config = get(g:, 'codeium_server_config', {})
-  let chat_ports = get(g:, 'codeium_port_config', {})
-  let manager_dir = tempname() . '/codeium/manager'
+  let config = get(g:, 'gemini_server_config', {})
+  let chat_ports = get(g:, 'gemini_port_config', {})
+  let manager_dir = tempname() . '/gemini/manager'
   call mkdir(manager_dir, 'p')
   let args = [
         \ s:bin,
-        \ '--api_server_url', get(config, 'api_url', 'https://server.codeium.com'),
+        \ '--api_server_url', get(config, 'api_url', 'https://server.gemini.com'),
         \ '--enable_local_search', '--enable_index_service', '--search_max_workspace_file_count', '5000',
         \ '--enable_chat_web_server', '--enable_chat_client'
         \ ]
   if has_key(config, 'api_url') && !empty(config.api_url)
     let args += ['--enterprise_mode']
-    let args += ['--portal_url', get(config, 'portal_url', 'https://codeium.example.com')]
+    let args += ['--portal_url', get(config, 'portal_url', 'https://gemini.example.com')]
   endif
-  if !codeium#util#IsUsingRemoteChat()
+  if !gemini#util#IsUsingRemoteChat()
     let args += ['--manager_dir', manager_dir]
   endif
-  " If either of these is set, only one vim window (with any number of buffers) will work with Codeium.
-  " Opening other vim windows won't be able to use Codeium features.
+  " If either of these is set, only one vim window (with any number of buffers) will work with Gemini.
+  " Opening other vim windows won't be able to use Gemini features.
   if has_key(chat_ports, 'web_server') && !empty(chat_ports.web_server)
     let args += ['--chat_web_server_port', chat_ports.web_server]
   endif
@@ -379,18 +379,18 @@ function! s:ActuallyStart() abort
     let args += ['--chat_client_port', chat_ports.chat_client]
   endif
 
-  call codeium#log#Info('Launching server with manager_dir ' . manager_dir)
+  call gemini#log#Info('Launching server with manager_dir ' . manager_dir)
   if has('nvim')
-    let g:codeium_server_job = jobstart(args, {
-                \ 'on_stderr': { channel, data, t -> codeium#log#Info('[SERVER] ' . join(data, "\n")) },
+    let g:gemini_server__job = jobstart(args, {
+                \ 'on_stderr': { channel, data, t -> gemini#log#Info('[SERVER] ' . join(data, "\n")) },
                 \ })
   else
-    let g:codeium_server_job = job_start(args, {
+    let g:gemini_server_job = job_start(args, {
                 \ 'out_mode': 'raw',
-                \ 'err_cb': { channel, data -> codeium#log#Info('[SERVER] ' . data) },
+                \ 'err_cb': { channel, data -> gemini#log#Info('[SERVER] ' . data) },
                 \ })
   endif
-  if !codeium#util#IsUsingRemoteChat()
+  if !gemini#util#IsUsingRemoteChat()
     call timer_start(500, function('s:FindPort', [manager_dir]), {'repeat': -1})
   endif
 
diff --git a/autoload/codeium/util.vim b/autoload/gemini/util.vim
similarity index 67%
rename from autoload/codeium/util.vim
rename to autoload/gemini/util.vim
index 48eae30b..8e8a9d90 100644
--- a/autoload/codeium/util.vim
+++ b/autoload/gemini/util.vim
@@ -1,15 +1,15 @@
-function! codeium#util#LineEndingChars(...) abort
+function! gemini#util#LineEndingChars(...) abort
   return "\n"
 endfunction
 
-function! codeium#util#HasSupportedVersion() abort
+function! gemini#util#HasSupportedVersion() abort
   let s:nvim_virt_text_support = has('nvim-0.6') && exists('*nvim_buf_get_mark')
   let s:vim_virt_text_support = has('patch-9.0.0185') && has('textprop')
 
   return s:nvim_virt_text_support || s:vim_virt_text_support
 endfunction
 
-function! codeium#util#IsUsingRemoteChat() abort
-  let chat_ports = get(g:, 'codeium_port_config', {})
+function! gemini#util#IsUsingRemoteChat() abort
+  let chat_ports = get(g:, 'gemini_port_config', {})
   return has_key(chat_ports, 'chat_client') && !empty(chat_ports.chat_client) && has_key(chat_ports, 'web_server') && !empty(chat_ports.web_server)
 endfunction
diff --git a/codeium-simple-logo.svg b/codeium-simple-logo.svg
deleted file mode 100644
index 7826d8f0..00000000
--- a/codeium-simple-logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M1 0a1 1 0 0 0-1 1v22c0 .063.007.124.018.184L0 23.199l.025.026c.103.443.5.775.975.775h22a1 1 0 0 0 1-1V1a1 1 0 0 0-1-1H1zm.707 1h20.582l-2 2H3.707l-2-2zM23 1.705v20.588l-2-2V3.705l2-2zM1 1.707l2 2v16.492l-2 2V1.707zM4 4h16v16H4V4zm3.537 3c-1.006 0-1.51.535-1.51 1.605v2.297c0 .4-.184.6-.554.6a.47.47 0 0 0-.344.139.512.512 0 0 0-.129.365c0 .144.042.261.129.353a.47.47 0 0 0 .344.139c.37 0 .554.2.554.6v2.297c0 1.07.504 1.605 1.51 1.605.136 0 .248-.05.334-.148A.494.494 0 0 0 8 16.498a.512.512 0 0 0-.129-.365.439.439 0 0 0-.334-.139c-.376 0-.564-.199-.564-.6v-2.296c0-.46-.1-.823-.297-1.092.099-.138.173-.3.222-.485.05-.183.075-.389.075-.619V8.605c0-.4.188-.6.564-.6a.439.439 0 0 0 .334-.138A.499.499 0 0 0 8 7.512a.53.53 0 0 0-.129-.364A.425.425 0 0 0 7.537 7zm8.926 0a.425.425 0 0 0-.334.148.53.53 0 0 0-.129.364c0 .144.043.263.129.355a.439.439 0 0 0 .334.139c.376 0 .564.199.564.6v2.296c0 .23.025.436.075.62.049.183.123.346.222.484-.197.27-.297.632-.297 1.092v2.297c0 .4-.188.6-.564.6a.439.439 0 0 0-.334.138.512.512 0 0 0-.129.365c0 .145.043.262.129.354a.425.425 0 0 0 .334.148c1.006 0 1.51-.535 1.51-1.605v-2.297c0-.4.184-.6.554-.6a.439.439 0 0 0 .334-.139.475.475 0 0 0 .139-.353.492.492 0 0 0-.139-.365.439.439 0 0 0-.334-.139c-.37 0-.554-.2-.554-.6V8.605c0-1.07-.504-1.605-1.51-1.605zm-7.25 6a.737.737 0 0 0-.496.227.717.717 0 0 0-.217.529.74.74 0 0 0 .75.744.74.74 0 0 0 .75-.744.717.717 0 0 0-.217-.53A.71.71 0 0 0 9.25 13h-.037zm2.75 0a.737.737 0 0 0-.496.227.717.717 0 0 0-.217.529.74.74 0 0 0 .217.53c.152.143.33.214.533.214a.74.74 0 0 0 .75-.744.717.717 0 0 0-.217-.53A.71.71 0 0 0 12 13h-.037zm2.75 0a.737.737 0 0 0-.496.227.717.717 0 0 0-.217.529.74.74 0 0 0 .217.53c.152.143.33.214.533.214a.74.74 0 0 0 .75-.744.717.717 0 0 0-.217-.53.71.71 0 0 0-.533-.226h-.037zm-11.1 8h16.68l2 2H1.613l2-2z"/></svg>
diff --git a/doc/codeium.txt b/doc/codeium.txt
deleted file mode 100644
index 5c33c70d..00000000
--- a/doc/codeium.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-*codeium.txt*  Codeium
-
-GETTING STARTED                                 *codeium*
-
-Run the `:Codeium Auth` command to login to Codeium. This is required to
-enable the plugin.
-
-Once logged in, suggested completions will be displayed inline as virtual
-text. You can insert a completion by pressing <Tab>.
-
-COMMANDS                                        *:Codeium*
-
-                                                *:Codeium_Auth*
-:Codeium Auth           Authenticate to Codeium.
-
-                                                *:Codeium_Chat*
-:Codeium Chat           Open Codeium Chat in a browser window
-
-                                                *:Codeium_Disable*
-:Codeium Disable        Disable Codeium completions
-
-                                                *:Codeium_Enable*
-:Codeium Enable         Re-enable Codeium completions after running :Codeium Disable
-
-                                                *:Codeium_DisableBuffer*
-:Codeium DisableBuffer  Disable Codeium completions in the current buffer only.
-
-                                                *:Codeium_EnableBuffer*
-:Codeium EnableBuffer   Re-enable Codeium completions in the current
-                        buffer after running :Codeium DisableBuffer
-
-                                                *:Codeium_Toggle*
-:Codeium Toggle         Enable Codeium completions if they are disabled.
-                        Disable Codeium completions if they are enabled. Does
-                        NOT enable completions for current buffer, if they are
-                        disabled with :Codeium DisableBuffer. However, still
-                        affects other buffers.
-
-OPTIONS                                         *codeium-options*
-
-                                                *g:codeium_filetypes*
-g:codeium_filetypes     A dictionary mapping whether codeium should be
-                        enabled or disabled in certain filetypes. This can
-                        be used to opt out of completions for certain filetypes.
->
-                        let g:codeium_filetypes = {
-                              \ 'bash': v:false,
-                              \ 'typescript': v:true,
-                              \ }
-<
-
-                                                *g:codeium_enabled*
-g:codeium_enabled       A global boolean flag that controls whether codeium
-                        completions are enabled or disabled by default.
->
-                        let g:codeium_enabled = v:true
-<
-
-                                                *g:codeium_manual*
-g:codeium_manual        If true, codeium completions will never automatically
-                        trigger.
->
-                        let g:codeium_manual = v:true
-<
-
-                                                *g:codeium_no_map_tab*
-g:codeium_no_map_tab    A global boolean flag that controls whether codeium
-                        uses <TAB> for the mapping codeium#Accept
->
-                        let g:codeium_no_map_tab = v:true
-<
-
-                                                *g:codeium_idle_delay*
-g:codeium_idle_delay    Delay in milliseconds before autocompletions are
-                        shown (limited by language server to a minimum of 75).
->
-                        let g:codeium_idle_delay = 500
-<
-                                                *g:codeium_render*
-g:codeium_render        A global boolean flag that controls whether codeium
-                        renders are enabled or disabled.
->
-                        let g:codeium_render = v:false
-<
-
-                                                *g:codeium_tab_fallback*
-g:codeium_tab_fallback  The fallback key when there is no suggestion display
-                        in `codeium#Accept()`.
->
-                        let g:codeium_tab_fallback = "\t"
-<
-                                                *g:codeium_bin*
-g:codeium_bin           Manually set the path to the `codeium` language server
-                        binary on your system.
-                        If unset, `codeium.vim` will fetch and download the
-                        binary from the internet.
->
-                        let g:codeium_bin = "~/.local/bin/codeium_language_server"
-<
-                                                *g:codeium_os*
-g:codeium_os            Manually set the host OS, accepted values are
-                        "Linux", "Darwin", "Windows". if unset, the value will
-                        be obtained using `uname`.
->
-                        let g:codeium_os = "Linux"
-<
-                                                *g:codeium_arch*
-g:codeium_arch          Manually set the host architecture, accepted values
-                        are "x86_64", "aarch64", "arm". If unset, the value
-                        will be obtained using `uname -m`.
->
-                        let g:codeium_arch = "x86_64"
-<
-                                                *g:codeium_port_config*
-g:codeium_port_config
-                        Set the ports the chat client and web server use.
-			Pass in web_server and chat_client fields to the mapping to set.
-                        Please note that if this option is set, only one
-			window will work with codeium.
-			It is recommended to set both the web_server and chat_client options
-			if using this. 
-			If you are setting this because you are using vim remotely and want chat to work
-			you will need to forward the two ports you set here, along with port 42100.
-			That window can have as many buffers within it, but any other
-			opened windows will not be able to use Codeium's features.
->
-                        let g:codeium_port_config = {
-				'web_server': <Your web server port>,
-				'chat_client': <Your chat client port>
-				}
-<
-                                                *g:codeium_virtual_text_priority*
-g:codeium_virtual_text_priority
-                        The priority used for Codeium's virtual text completions
-                        in Neovim. This can control how completions appear when
-                        multiple virtual text items are on the same line, such
-                        as when using LSP inlay hints.
-
-                        The priority can be set on a per-buffer basis by setting
-                        the b:codeium_virtual_text_priority variable. If
-                        neither of these are set, the default priority is 65535,
-                        which will usually place it above any other virtual text.
->
-                        let g:codeium_virtual_text_priority = 1000
-<
-
-                                                *b:codeium_virtual_text_priority*
-b:codeium_virtual_text_priority
-                        The priority given to Codeium's virtual text completions
-                        for the current buffer in Neovim. If not set,
-                        g:codeium_virtual_text_priority is used.
->
-                        let b:codeium_virtual_text_priority = 1000
-<
-
-MAPS                                            *codeium-maps*
-
-                                                *codeium-i_<Tab>*
-Codeium.vim defaults to using the <Tab> key to insert the current
-suggestion. If there is no suggestion display, the <Tab> key will fallback
-to any existing <Tab> mapping you have. This is bound to `codeium#Accept()`
-
-Other Maps ~
-
-                                                *codeium-i_CTRL-]*
-<C-]>                   Dismiss the current suggestion.
-<Plug>(codeium-dismiss)
-<Cmd>call codeium#Clear()<CR>
-
-                                                *codeium-i_ALT-]*
-<M-]>                   Cycle to the next suggestion.
-<Plug>(codeium-next)
-<Cmd>call codeium#CycleCompletions(1)<CR>
-
-                                                *codeium-i_ALT-[*
-<M-[>                   Cycle to the previous suggestion.
-<Plug>(codeium-previous)
-<Cmd>call codeium#CycleCompletions(-1)<CR>
-
-SYNTAX HIGHLIGHTING                             *codeium-highlighting*
-
-Inline suggestions are highlighted using the CodeiumSuggestion group,
-which defaults to a gray color. You can configure this highlight group for
-your colorscheme in after/colors/<colorschemename>.vim in your
-'runtimepath' (e.g., ~/.config/nvim/after/colors/solarized.vim).  Example
-declaration:
->
-        highlight CodeiumSuggestion guifg=#555555 ctermfg=8
-<
- vim:tw=78:et:ft=help:norl:
diff --git a/doc/gemini.txt b/doc/gemini.txt
new file mode 100644
index 00000000..8813b1bb
--- /dev/null
+++ b/doc/gemini.txt
@@ -0,0 +1,146 @@
+*gemini.txt*	For Vim version 9.0.  Last change: 2023 May 16
+
+		  _  __ _           _
+		 / |/ _(_)_ __ ___| |
+		 | | |_| | '__/ __| |
+		 | |  _| | | | (__|_|
+		 |_|_| |_|_|  \___(_)
+
+==============================================================================
+CONTENTS						*gemini-contents*
+
+  1. Intro.................................... |gemini-intro|
+  2. Commands................................. |gemini-commands|
+  3. Configuration............................ |gemini-configuration|
+  4. Maps..................................... |gemini-maps|
+  5. Syntax Highlighting...................... |gemini-highlighting|
+
+==============================================================================
+INTRO						*gemini-intro*
+
+Gemini is a free, fast and unobtrusive AI code completion tool that works
+in Vim and Neovim.
+
+==============================================================================
+COMMANDS					*gemini-commands*
+
+							*:Gemini*
+:Gemini {cmd}
+		Main command for interacting with Gemini.  Possible values for
+		{cmd} are:
+		Auth			   Authorize this plugin.
+		Enable			   Enable Gemini.
+		Disable			   Disable Gemini.
+		Toggle			   Toggle Gemini.
+		ManualEnable		   Enable manual suggestions.
+		ManualDisable		   Disable manual suggestions.
+		Chat			   Launch Gemini Chat.
+
+==============================================================================
+CONFIGURATION					*gemini-configuration*
+
+							*g:gemini_enabled*
+g:gemini_enabled
+		When set to |v:false|, Gemini is disabled by default. It can
+		be enabled per-buffer with |:GeminiEnable|.
+
+							*g:gemini_filetypes_disabled_by_default*
+g:gemini_filetypes_disabled_by_default
+		When set to |v:true|, Gemini is disabled by default for all filetypes.
+		It can be enabled for specific filetypes with |g:gemini_filetypes|.
+
+							*g:gemini_filetypes*
+g:gemini_filetypes
+		A |Dictionary| of filetypes to enable or disable Gemini for.
+		For example:
+			let g:gemini_filetypes = {
+			    \ "bash": v:false,
+			    \ "typescript": v:true,
+			    \ }
+		This will disable Gemini for bash files and enable it for
+		typescript files.
+
+							*g:gemini_disable_bindings*
+g:gemini_disable_bindings
+		When set to 1, all default keybindings are disabled.
+
+							*g:gemini_no_map_tab*
+g:gemini_no_map_tab
+		When set to 1, the <Tab> keybinding is disabled.
+
+							*g:gemini_manual*
+g:gemini_manual
+		When set to |v:true|, Gemini will not automatically trigger
+		completions. You can still trigger them manually with
+		|<Plug>(gemini-complete)|.
+
+							*g:gemini_render*
+g:gemini_render
+		When set to |v:false|, Gemini will not render completions
+		inline. You can still cycle through them and accept them.
+
+							*g:gemini_idle_delay*
+g:gemini_idle_delay
+		The delay in milliseconds before Gemini will trigger a
+		completion. Defaults to 75.
+
+							*g:gemini_log_level*
+g:gemini_log_level
+		The log level for Gemini. Possible values are "ERROR", "WARN",
+		"INFO", "DEBUG", and "TRACE". Defaults to "WARN".
+
+							*g:gemini_server_config*
+g:gemini_server_config
+		A |Dictionary| of server configuration options. For example:
+			let g:gemini_server_config = {
+			    \ "portal_url": "https://gemini.example.com",
+			    \ "api_url": "https://server.gemini.example.com"
+			    \ }
+		This will configure Gemini to use a custom server.
+
+							*g:gemini_log_file*
+g:gemini_log_file
+		The path to the log file. Defaults to a temporary file.
+
+							*g:gemini_virtual_text_priority*
+g:gemini_virtual_text_priority
+		The priority of the virtual text. Defaults to 65535. Only works in
+		neovim. This is useful if you want to use Gemini with other plugins
+		that use virtual text, like |LSP|.
+
+							*b:gemini_virtual_text_priority*
+b:gemini_virtual_text_priority
+		Same as |g:gemini_virtual_text_priority|, but for the current
+		buffer. If this is not set, |g:gemini_virtual_text_priority| is used.
+		For example:
+			let b:gemini_virtual_text_priority = 1000
+
+==============================================================================
+MAPS						*gemini-maps*
+
+							*gemini-i_<Tab>*
+This plugin maps <Tab> to accept the current suggestion. This will fall back
+to any existing <Tab> mapping you have. This is bound to `gemini#Accept()`
+and can be remapped. See |g:gemini_no_map_tab| to disable this mapping.
+
+							*gemini-i_CTRL-]*
+This plugin maps <C-]> to dismiss the current suggestion. This is bound to
+<Plug>(gemini-dismiss)
+<Cmd>call gemini#Clear()<CR>
+
+							*gemini-i_ALT-]*
+This plugin maps <M-]> to cycle to the next suggestion. This is bound to
+<Plug>(gemini-next)
+<Cmd>call gemini#CycleCompletions(1)<CR>
+
+							*gemini-i_ALT-[*
+This plugin maps <M-[> to cycle to the previous suggestion. This is bound to
+<Plug>(gemini-previous)
+<Cmd>call gemini#CycleCompletions(-1)<CR>
+
+==============================================================================
+SYNTAX HIGHLIGHTING				*gemini-highlighting*
+
+This plugin defines the `GeminiSuggestion` highlight group. You can
+customize this to your liking. For example:
+	highlight link GeminiSuggestion Comment
diff --git a/plugin/codeium.vim b/plugin/gemini.vim
similarity index 95%
rename from plugin/codeium.vim
rename to plugin/gemini.vim
index 36f1bd07..932b152f 100644
--- a/plugin/codeium.vim
+++ b/plugin/gemini.vim
@@ -1,11 +1,11 @@
-if exists('g:loaded_codeium')
+if exists('g:loaded_gemini')
   finish
 endif
-let g:loaded_codeium = 1
+let g:loaded_gemini = 1
 
-command! -nargs=? -complete=customlist,codeium#command#Complete Codeium exe codeium#command#Command(<q-args>)
+command! -nargs=? -complete=customlist,gemini#command#Complete Gemini exe gemini#command#Command(<q-args>)
 
-if !codeium#util#HasSupportedVersion()
+if !gemini#util#HasSupportedVersion()
     finish
 endif
 
diff --git a/test_vimrc b/test_vimrc
new file mode 100644
index 00000000..048f0432
--- /dev/null
+++ b/test_vimrc
@@ -0,0 +1,12 @@
+set rtp+=.
+set nocompatible
+
+" Set up Gemini
+let g:gemini_enabled = v:true
+let g:gemini_log_level = 'DEBUG'
+
+" Run Auth to set a dummy API key
+call gemini#command#Command('Auth')
+
+" Print the log file path
+echom "Log file: " . gemini#log#Logfile()
diff --git a/windsurf.png b/windsurf.png
deleted file mode 100644
index cd191d57..00000000
Binary files a/windsurf.png and /dev/null differ