Minor changes of names and comments.