add some naming conventions