Updated names, comments and errors.