Rename structures to standard style.