change some annotation and variable name

change some annotation and variable name
change some annotation and variable name

change some annotation and variable name