Fixed parser error with alternate names. Ready to merge