[2] Fixed some errors and updated names.