More replace rules in paver