Refactored repo isset
Changed (base) name logic for Repository