fix some namin convention
merge with conflict