Naming convention fix.

Change-Id: If1661a9c35fafb048b2a30b9fefbace7668e98d7
Merge "Naming convention fix."