This is correct. What's important for industry is understanding the energy balance, i.e. entries and exits to and from the grid. "Generation" is a catch-all term for grid entries.