Refactor for common naming convention