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

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