Fixed some naming issues and some comments.