Fix names

Issue-ID: AAF-1046
Change-Id: Idd0d5e2272863f021842eaa604e11728c1379c5f
Signed-off-by: Instrumental <jonathan.gathman@att.com>
20 files changed