Rename sources, add suppress recreate trigger, log directly ms id