more repo clean-up / renaming for disambiguation