Moving to new symbols
Revert "Moving to new symbols"

This reverts commit ed6b5ca3b1e5ab61ee76b65ef522d08e0ecb9ff3.
Changed ordering first
Converted over symbols again