rename some models and add some morecomments