Rename a whole bunch of stuff
Refine the Rakefile