I'm thinking of limiting the focus of my future fiction to Spypunk. Despite how it sounds, it's less rogue espionage agents, or more about how spy tech has become ubiquitous among hackers, making the NSA and other agencies jobs harder. It can be thought of as a subset of Cyberpunk.