No longer require names.el
Fix usage of win-end