Rename options and add whitespaces

Signed-off-by: Yunlu Zhang <Yunlu.Zhang@synopsys.com>