Fix more scope definition

Signed-off-by: Henry Chen <hchen@vmware.com>