All the changes between `symbol->Class` and `resolve` should be reverted, but keep the typos fixes.