Renames for clarity. Also update constraints.