Fix substitution and alpha renaming for CoreAlt