code cosmetics: changing from Xml to Html class in most cases

Change-Id: I982b39f13db667f32db6abbbc550ddd395cada6d