Yeah I personally use the concepts interchangeably but if you go to the pun competitions in the bay area they will disqualify spoonerisms in the general sense which includes any partial word substitutions like "punderdome"