Replaced deprecated methodswith actual ones.
Authored by: merry75 2017-01-09
Parent: [r418]
Child: [r420]