Rename constraint(s) and public functions