More FileSegmenter cleanup, added name information to segments to ease debugging