Minor cleanup of file names and removed comments in Rakefile.