change global name, fix whitespace, rename alias file, modernize

Change-Id: Ie3651ad9d7c5f3c4c837575ca8087e9b2c98e731