Rename builder methods

Rebased on rename-progressdialogupdater, so best merge that first.