updated some text and labels to new branding from pivotal
STS-3455: add additional check
STS-3455: final check added