A few more renames for consistency