Rename wizard views and fix a few things.