Changed (base) name logic for Repository