abstract repo/model naming change

fixed some of the naming conventions, just because