I have to tell you a bizarre little story -- with a bit of bizarre background. When you told me that embroidery/craft shops were called haberdashery shops, I couldn't stop laughing to myself.
I've been active in the SCA -- medieval recreation group which isn't quite so odd and off-the-wall now as it was in years past -- for many years. Some time back, one of our royals had a herald (think 'PA system') who couldn't pronounce his way out of a paper bag. Official courts were quite painful, if only because of holding in the mocking laughter. One of my dear friends got an award one night, and because it was for making hats and clothes and accessories and stuff, the 'craft' she got the award in was "Haberdashery". But... when the particularly insufficient herald announced her award, he did not say "Haberdashery".
He said "Handcockery". As "Hand" "Cock" "ery".
So to me (and a good many others who were there that night) whenever I hear the term "Haberdashery" I *immediately* think "Handcockery" and start sporfling. (Mind you, this was over 10 years ago, and we STILL chortle about it.) And considering what I was planning on having Snape and Lupin do in the embroidery shop....
It's enough to make one want to start using the term 'handcockeries' instead of 'handicrafts'. (Well, at least for some of the handicrafts.) ;-)
Suffice to say that I can't wait to tell my friends what craft shops are called in England. XD