Fixed some naming conventions.