diff --git a/doc/editors.html b/doc/editors.html
index 1da83daf07..5df5d38bce 100644
--- a/doc/editors.html
+++ b/doc/editors.html
@@ -19,12 +19,12 @@ editing, navigation, testing, and debugging experience.
 </p>
 
 <ul>
-<li><a href="https://github.com/fatih/vim-go">Vim Go</a>: a plugin for Vim to provide Go programming language support</li>
-<li><a href="https://marketplace.visualstudio.com/items?itemName=lukehoban.Go">Visual Studio Code Go</a>:
-an extension for Visual Studio Code to provide support for the Go programming language</li>
+<li><a href="https://github.com/fatih/vim-go">vim</a>: vim-go plugin provides Go programming language support</li>
+<li><a href="https://marketplace.visualstudio.com/items?itemName=lukehoban.Go">Visual Studio Code</a>:
+Go extension provides support for the Go programming language</li>
 <li><a href="https://www.jetbrains.com/go">Gogland</a>: Gogland is distributed either as a standalone IDE
 or as a plugin for the IntelliJ Platform IDEs</li>
-<li><a href="https://atom.io/packages/go-plus">Go-Plus</a>: Go-Plus is an Atom package that provides enhanced Go support</li>
+<li><a href="https://atom.io/packages/go-plus">Atom</a>: Go-Plus is an Atom package that provides enhanced Go support</li>
 </ul>
 
 <p>
@@ -42,10 +42,10 @@ The following feature matrix lists and compares the most significant features.
 <table class="features-matrix">
   <tr>
     <th></th>
-    <th><img title="Vim Go" src="/doc/editors/vimgo.png"><br>Vim Go</th>
-    <th><img title="Visual Studio Code" src="/doc/editors/vscodego.png"><br>Visual Studio Code Go</th>
+    <th><img title="Vim Go" src="/doc/editors/vimgo.png"><br>vim</th>
+    <th><img title="Visual Studio Code" src="/doc/editors/vscodego.png"><br>Visual Studio Code</th>
     <th><img title="Gogland" src="/doc/editors/gogland.png"><br>Gogland</th>
-    <th><img title="Go-Plus" src="/doc/editors/go-plus.png"><br>Go-Plus</th>
+    <th><img title="Go-Plus" src="/doc/editors/go-plus.png"><br>Atom</th>
   </tr>
   <tr>
     <td class="feature-row" colspan="5">Editing features</td>