Updated some naming conventions