Simple renames for great clarity.