diff --git a/Makefile b/Makefile
index ee24373..d9bc829 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 proto = userinput.proto hostinput.proto transportinstruction.proto
-source = parse.cpp parserstate.cpp parser.cpp terminal.cpp termemu.cpp parseraction.cpp terminalfunctions.cpp swrite.cpp terminalframebuffer.cpp terminaldispatcher.cpp terminaluserinput.cpp terminaldisplay.cpp network.cpp ntester.cpp ocb.cpp base64.cpp encrypt.cpp decrypt.cpp crypto.cpp networktransport.cpp transportfragment.cpp user.cpp userinput.pb.cc completeterminal.cpp stm-server.cpp stm.cpp transportinstruction.pb.cc transportsender.cpp stmclient.cpp terminaloverlay.cpp hostinput.pb.cc
+source = parse.cpp parserstate.cpp parser.cpp terminal.cpp termemu.cpp parseraction.cpp terminalfunctions.cpp swrite.cpp terminalframebuffer.cpp terminaldispatcher.cpp terminaluserinput.cpp terminaldisplay.cpp network.cpp ntester.cpp ocb.cpp base64.cpp encrypt.cpp decrypt.cpp crypto.cpp networktransport.cpp transportfragment.cpp user.cpp userinput.pb.cc completeterminal.cpp mosh-server.cpp mosh.cpp transportinstruction.pb.cc transportsender.cpp stmclient.cpp terminaloverlay.cpp hostinput.pb.cc
 objects = parserstate.o parser.o terminal.o parseraction.o terminalfunctions.o swrite.o terminalframebuffer.o terminaldispatcher.o terminaluserinput.o terminaldisplay.o network.o ocb.o base64.o crypto.o networktransport.o transportfragment.o user.o userinput.pb.o completeterminal.o transportinstruction.pb.o transportsender.o stmclient.o terminaloverlay.o hostinput.pb.o
-executables = parse termemu ntester encrypt decrypt stm-server stm
+executables = parse termemu ntester encrypt decrypt mosh-server mosh
 
 CXX = g++
 CXXFLAGS = -g -O2 --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500 -D_GNU_SOURCE -D_BSD_SOURCE
@@ -25,11 +25,11 @@ encrypt: encrypt.o $(objects)
 decrypt: decrypt.o $(objects)
 	$(CXX) $(CXXFLAGS) -o $@ decrypt.o $(objects) $(LIBS)
 
-stm-server: stm-server.o $(objects)
-	$(CXX) $(CXXFLAGS) -o $@ stm-server.o $(objects) $(LIBS)
+mosh-server: mosh-server.o $(objects)
+	$(CXX) $(CXXFLAGS) -o $@ mosh-server.o $(objects) $(LIBS)
 
-stm: stm.o $(objects)
-	$(CXX) $(CXXFLAGS) -o $@ stm.o $(objects) $(LIBS)
+mosh: mosh.o $(objects)
+	$(CXX) $(CXXFLAGS) -o $@ mosh.o $(objects) $(LIBS)
 
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
diff --git a/stm-server.cpp b/mosh-server.cpp
similarity index 98%
rename from stm-server.cpp
rename to mosh-server.cpp
index b147287..2da68de 100644
--- a/stm-server.cpp
+++ b/mosh-server.cpp
@@ -47,7 +47,7 @@ int main( int argc, char *argv[] )
 
   /* Verify locale calls for UTF-8 */
   if ( strcmp( nl_langinfo( CODESET ), "UTF-8" ) != 0 ) {
-    fprintf( stderr, "stm requires a UTF-8 locale.\n" );
+    fprintf( stderr, "mosh requires a UTF-8 locale.\n" );
     exit( 1 );
   }
 
@@ -115,7 +115,7 @@ int main( int argc, char *argv[] )
     }
   }
 
-  printf( "[stm-server is exiting.]\n" );
+  printf( "[mosh-server is exiting.]\n" );
 
   return 0;
 }
diff --git a/stm.cpp b/mosh.cpp
similarity index 100%
rename from stm.cpp
rename to mosh.cpp
diff --git a/networktransport.cpp b/networktransport.cpp
index 1702f05..e26f0e8 100644
--- a/networktransport.cpp
+++ b/networktransport.cpp
@@ -44,7 +44,7 @@ void Transport<MyState, RemoteState>::recv( void )
     Instruction inst = fragments.get_assembly();
 
     if ( inst.protocol_version() != MOSH_PROTOCOL_VERSION ) {
-      throw NetworkException( "Mosh protocol version mismatch", 0 );
+      throw NetworkException( "mosh protocol version mismatch", 0 );
     }
 
     sender.process_acknowledgment_through( inst.ack_num() );