Simple now, only really aliases the classes, but we'll use them to replace the hooking infrastructure in the near future. Change-Id: I963a4887a717c9bb064e30fa5fb86bbccb7186a1