HOPKINS: Give proepr names to some of the previously unnamed structure fields
HOPKINS: More field renamings