Now uses the full name from the struc file - no need to recreate.