updating a few instances of the x-win-system-metric namespace that I missed.