Pulled duplicated find_name method up to super class