Added some functionality to account for MOST renaming incidents