Changed the few old routine names still used to the new ones
Started working on MSL support
3 files changed