Update to define guard extensions with similar names (ugh)