Missed renames in code base

Some searches were accidentally done as case sensitive. This
change fixes comments, and an environment variable in generate_sample.sh

Partial-Implements: blueprint savanna-renaming-service
Change-Id: If65c02a5478ee41ee089ec540d48ccf672407b07
Merge "Missed renames in code base"