Handle classes with same name as typeFixes

pretty hacky but resolveType() has too many side effects to reuse