BZ-8766: Improvements to the language and flow to stories for Energy Star Data Exchange.