Update names for clarity.