Error fixing and name updating

[2] Fixed some errors and updated names.