Renamed subsitutions.
Fix to dict.