Cosmetic changes to naming of windows. Because if we can't be creative, we can at least be consistent.