I'd categorize a cypherpunk as a very specific form a cyberpunk, so to me that's normal journalistic form to use both terms at some point in an article.