changed html naming scheme