Additional clean up from renaming

Change-Id: Ic82419d679047dfaccec6a15828050b7b0c05c1b
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>