A couple of missed renamings in 790a2c2bee11ca1

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>