Refactor GUI items so they have sensible names