Fix instance class fields
compat-table names
#14210
Merged
instance class fields
compat-table names
#14210