Update names, comments for clarity.