Updating header guard macro names.

They now match the package and file name.