HOPKINS: Rename several structures