Updated use_cases to deal with name changing situations