diff --git a/pkgs/applications/editors/o/default.nix b/pkgs/applications/editors/orbiton/default.nix
similarity index 79%
rename from pkgs/applications/editors/o/default.nix
rename to pkgs/applications/editors/orbiton/default.nix
index 18654f3901e6..ec8eb24073c2 100644
--- a/pkgs/applications/editors/o/default.nix
+++ b/pkgs/applications/editors/orbiton/default.nix
@@ -3,17 +3,17 @@
 }:
 
 buildGoModule rec {
-  pname = "o";
-  version = "2.58.0";
+  pname = "orbiton";
+  version = "2.60.5";
 
   src = fetchFromGitHub {
     owner = "xyproto";
-    repo = "o";
+    repo = "orbiton";
     rev = "v${version}";
-    hash = "sha256-oYWlciTQ/4mm/gTSQEkD/xPeLfDjIAMksjj1DVodZW4=";
+    hash = "sha256-gCE4mrZXLFteZKUPDsAc1hS1I/WTns9I9oZE5bAF7fU=";
   };
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile \
@@ -33,6 +33,7 @@ buildGoModule rec {
   postInstall = ''
     cd ..
     installManPage o.1
+    mv $out/bin/{orbiton,o}
   '' + lib.optionalString withGui ''
     make install-gui PREFIX=$out
     wrapProgram $out/bin/og --prefix PATH : $out/bin
@@ -40,8 +41,9 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "Config-free text editor and IDE limited to VT100";
-    homepage = "https://github.com/xyproto/o";
+    homepage = "https://github.com/xyproto/orbiton";
     license = licenses.bsd3;
     maintainers = with maintainers; [ sikmir ];
+    mainProgram = "o";
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c124bc27d21b..1cbf0e22fad7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1121,6 +1121,7 @@ mapAliases ({
 
   ### O ###
 
+  o = orbiton; # Added 2023-04-09
   oathToolkit = oath-toolkit; # Added 2022-04-04
   oci-image-tool = throw "oci-image-tool is no longer actively maintained, and has had major deficiencies for several years."; # Added 2022-05-14;
   oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2dabe7e3072..7ccf3d838138 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29680,9 +29680,7 @@ with pkgs;
 
   edlin = callPackage ../applications/editors/edlin { };
 
-  o = callPackage ../applications/editors/o {
-    buildGoModule = buildGo119Module; # go 1.20 build failure
-  };
+  orbiton = callPackage ../applications/editors/orbiton { };
 
   oed = callPackage ../applications/editors/oed { };