am de3dc40d: am 97b1e2d6: Fixes a renaming bug (renamed instantiation without refactoring uses)

* commit 'de3dc40d5b364ff65924573c0111afdd63ffd257':
  Fixes a renaming bug (renamed instantiation without refactoring uses)