risk: Refactor to avoid name collisions during generation#22

mprimeaux merged 1 commit intomainsixafter/types:mainfrom

debt/depssixafter/types:debt/depsCopy head branch name to clipboard