Rename instantiation

Change-Id: Ie475230bda43f3b88b050ced30f54d26f372572a