17: remove substitutes' prefix (no clashes anymore)