diff --git a/src/apps/terminal/Jamfile b/src/apps/terminal/Jamfile
index c6bb8fe6a1..a5c1f022d5 100644
--- a/src/apps/terminal/Jamfile
+++ b/src/apps/terminal/Jamfile
@@ -15,7 +15,7 @@ Application Terminal :
 	PrefHandler.cpp
 	PrefView.cpp
 	PrefWindow.cpp
-	spawn.cpp
+	Shell.cpp
 	TermApp.cpp
 	TermBaseView.cpp
 	TermBuffer.cpp
diff --git a/src/apps/terminal/PrefWindow.cpp b/src/apps/terminal/PrefWindow.cpp
index 9441a1d93a..99c4ca5300 100644
--- a/src/apps/terminal/PrefWindow.cpp
+++ b/src/apps/terminal/PrefWindow.cpp
@@ -11,7 +11,7 @@
 #include "PrefHandler.h"
 #include "PrefWindow.h"
 #include "PrefView.h"
-#include "spawn.h"
+#include "Shell.h"
 #include "TermConst.h"
 
 #include <Alert.h>
diff --git a/src/apps/terminal/spawn.cpp b/src/apps/terminal/Shell.cpp
similarity index 99%
rename from src/apps/terminal/spawn.cpp
rename to src/apps/terminal/Shell.cpp
index df0cdcf167..eac8b330fb 100644
--- a/src/apps/terminal/spawn.cpp
+++ b/src/apps/terminal/Shell.cpp
@@ -47,7 +47,7 @@
 #include <OS.h>
 
 #include "TermConst.h"
-#include "spawn.h"
+#include "Shell.h"
 #include "PrefHandler.h"
 
 extern PrefHandler *gTermPref;
diff --git a/src/apps/terminal/spawn.h b/src/apps/terminal/Shell.h
similarity index 98%
rename from src/apps/terminal/spawn.h
rename to src/apps/terminal/Shell.h
index 258e0a41d5..c7f42bc14a 100644
--- a/src/apps/terminal/spawn.h
+++ b/src/apps/terminal/Shell.h
@@ -29,8 +29,8 @@
  *
  */
 
-#ifndef SPAWN_H
-#define SPAWN_H
+#ifndef _SHELL_H
+#define _SHELL_H
 
 #define MAXPTTYS 16 * 4
 
@@ -106,4 +106,4 @@ private:
 	int fFd;	
 };
 
-#endif /* SPAWN_H */
+#endif // _SHELL_H
diff --git a/src/apps/terminal/TermApp.cpp b/src/apps/terminal/TermApp.cpp
index 23ac8a4503..52aad5092a 100644
--- a/src/apps/terminal/TermApp.cpp
+++ b/src/apps/terminal/TermApp.cpp
@@ -11,7 +11,6 @@
 
 #include "CodeConv.h"
 #include "PrefHandler.h"
-//#include "spawn.h"
 #include "TermBuffer.h"
 #include "TermWindow.h"
 #include "TermConst.h"
@@ -25,7 +24,6 @@
 #include <String.h>
 #include <TextView.h>
 
-//#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp
index f0d86569a9..265c93e954 100644
--- a/src/apps/terminal/TermView.cpp
+++ b/src/apps/terminal/TermView.cpp
@@ -22,7 +22,7 @@
 #include "PrefHandler.h"
 #include "MenuUtil.h"
 #include "PrefView.h"
-#include "spawn.h"
+#include "Shell.h"
 
 #include <Autolock.h>
 #include <Beep.h>
diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp
index 1fc19bd81a..4815d54e56 100644
--- a/src/apps/terminal/TermWindow.cpp
+++ b/src/apps/terminal/TermWindow.cpp
@@ -40,7 +40,7 @@
 #include "TermView.h"
 #include "TermWindow.h"
 #include "TermConst.h"
-#include "spawn.h"
+#include "Shell.h"
 
 
 // Global Preference Handler