am 25f9694f: Fix detection of empty structured names

* commit '25f9694fcad5ce1856f5c214c4167dc58464ef4f':
  Fix detection of empty structured names