More renaming stuff. Reads a lot better now.