Functions renamed

Renamed functions to distinguish between data retrieval and generation.