I left a number of the methods and such as viewlet* to keep this PR easier to read, as it is the renames make it hard to follow. It's pretty trivial to do a replace on the names in a future branch.