rename user/name

Change-Id: Ib5c825c45fdb89427cde10b5b785901a6fd6b0f1
Signed-off-by: Zhiguang Li <muzili@gmail.com>