Update substitutions/renaming