header guard naming consistency

Change-Id: Iebbf5c586f5d2961be98b12638def3adbadef136