Update HTML naming issues