Mostly updating the names used in the dust module.