Jkingdon/repository name cleanups

These are two minor cleanups to the repository name code which was merged in September.

@square/kochiku-contributors