Name changed. Minor fixes.

Change-Id: Iba89a308466a87adc4a9806c995d4b9e8db4a5e8
Merge "Name changed. Minor fixes."