Or are you the sort of maverick who uses it interchangeably?

I'm definitely more of an old meaning type of guy, but you already knew that. A recent Guardian guide went with the maverick option. Not cool.