Renamed a few method related to html!