[CHORE] Fixing some naming issues with AbstractRepository