more work on renaming structures