name consistency, small html changes

Change-Id: I277b46792d299c2bc0bd87bf1a540da645440370