Rename some handler methods for clarity