Closes #154 and updates #77 - Separates out or removes confusing "human readable" field names