Fix some missed class renames

Change-Id: I53e36adb49b7ca4084a8c805db3099e1a51372f0
1 file changed