Slight renames to keep things consistent and clear.