Fix structure name change