#398: Keep the canonical name of repositories
#398: Refactor Repository Type so it can be used more generally