Maybe change the first parameter name from `name` to `id` since you've made the switch elsewhere.