Some renames for consistency