Yes, is like the first option I mentioned, but see that is better to join first the ticker and then the Name, to avoid the problem you have when you want to search a ticker you know eg. ‘X’ (United States Steel Corp), the search will give you all the Company names that has an ‘x’ in their names from the first listed name).
Also in both options additionally you can apply this solution for the issue mentioned: