Re-normalized indentation, renamed rename command

One of these days, I will globally s/^I/   /g, but not today.