Renaming and simplifying dom.