MUMNOTPLT-25 : Renamed stuff