Unrelated to this PR, but I really think inflection should happen in the router and not have it sprinkled everywhere