#8263 part 2: Adding struct name.