Cleanup internalList method names and data stores

Rename some methods and erase the HTML data after conversion.

Change-Id: Ic7317db2c7693591fda4bea459631981a69003f3
Merge "Cleanup internalList method names and data stores"