make substitutions consistent