Concepts cleanup.

Change-Id: I7ecc2989c14d26c47a8b0add293cd678871ef6fe
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>