Rename elements to clarify ordering.