Fixed names and comments