refactor for naming conventions to reflect CRUD