Replaced some downstream terms with substitutions
Removed double dash (--) in file name and adjusted index
Fixed broken label
Incorporated comment from patchset 1
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: I199481424a9630ad828c4570ac2ff0cbbb4f7c60
Signed-off-by: Ron Stone <ronald.stone@windriver.com>