Update some class names to non-deprecated version

Change-Id: I6c287c437f82f01588cd0e20363597093b366771
Merge "Update some class names to non-deprecated version"