"Musket," "blunderbuss," and "flintlock" are not mutually exclusive things. Blunderbusses and muskets were often flintlocks. "Flintlock" is just how the firearm functioned mechanically. It'd be like calling "bolt action" and "rifle" two different things.