A few more renames for consistancy.