cleanup of names and rakefile