diff --git a/Aliases/mobile-shell b/Aliases/mobile-shell
new file mode 120000
index 0000000000..2e2a9dec9e
--- /dev/null
+++ b/Aliases/mobile-shell
@@ -0,0 +1 @@
+../Formula/mosh.rb
\ No newline at end of file
diff --git a/Aliases/mosh b/Aliases/mosh
deleted file mode 120000
index 55adf23502..0000000000
--- a/Aliases/mosh
+++ /dev/null
@@ -1 +0,0 @@
-../Formula/mobile-shell.rb
\ No newline at end of file
diff --git a/Formula/mobile-shell.rb b/Formula/mosh.rb
similarity index 98%
rename from Formula/mobile-shell.rb
rename to Formula/mosh.rb
index a17cfb8aa9..139b7feb92 100644
--- a/Formula/mobile-shell.rb
+++ b/Formula/mosh.rb
@@ -1,4 +1,4 @@
-class MobileShell < Formula
+class Mosh < Formula
   desc "Remote terminal application"
   homepage "https://mosh.org"
   url "https://mosh.org/mosh-1.3.2.tar.gz"
diff --git a/formula_renames.json b/formula_renames.json
index 17e4e4c54d..804fb56052 100644
--- a/formula_renames.json
+++ b/formula_renames.json
@@ -107,6 +107,7 @@
   "mariadb100": "mariadb@10.0",
   "maven31": "maven@3.1",
   "maven32": "maven@3.2",
+  "mobile-shell": "mosh",
   "mongo-c": "mongo-c-driver",
   "mongodb26": "mongodb@2.6",
   "mongodb30": "mongodb@3.0",