diff --git a/lib/author.rb b/app/models/author.rb
similarity index 100%
rename from lib/author.rb
rename to app/models/author.rb
diff --git a/lib/page_set.rb b/app/models/page_set.rb
similarity index 100%
rename from lib/page_set.rb
rename to app/models/page_set.rb
diff --git a/lib/wiki.rb b/app/models/wiki.rb
similarity index 100%
rename from lib/wiki.rb
rename to app/models/wiki.rb
diff --git a/script/server b/script/server
index 0044d3ef..27a7989a 100755
--- a/script/server
+++ b/script/server
@@ -21,13 +21,13 @@ ARGV.options do |opts|
           "Runs Instiki on the specified port.",
           "Default: 2500") { |OPTIONS[:port]| }
   opts.on("-b", "--binding=ip", String,
-          "Binds Rails to the specified ip.",
+          "Binds Instiki to the specified ip.",
           "Default: 0.0.0.0") { |OPTIONS[:ip]| }
   opts.on("-e", "--environment=name", String,
           "Specifies the environment to run this server under (test/development/production).",
           "Default: development") { |OPTIONS[:environment]| }
   opts.on("-d", "--daemon",
-          "Make Rails run as a Daemon (only works if fork is available -- meaning on *nix)."
+          "Make Instiki run as a Daemon (only works if fork is available -- meaning on *nix)."
           ) { OPTIONS[:server_type] = WEBrick::Daemon }
 
   opts.separator ""