Minor renaming for consistency