Update SS Text
Add support for using mixed name and alias conventions