Fix legacy class refs

Change-Id: Icf913ab7826613d867656f46b27d52dff94be09b