Minor renaming for clarity