Adapt logging namings.

Change-Id: I6209050caeb2f778f88aaf2d095713373559c56f