I've made a note for the wrapper styling name swap for the next sprint's subtasks. Avoiding this work now lets our currently split styling and templating PRs land quickly.