Fix name clash

New format for include guards