changing naming convention to be more focused