Rename and comment for clarity