Minor renaming and refactoring

Change-Id: If307a8dd3f81315a24cc503b9367395b2f3ee955
Signed-off-by: Brian McGillion <brian.mcgillion@intel.com>