Changed the usecases to use the new function names
Supp files and updated MS