Fixed some naming conventions