Add scope_name function back in