What were Q-ships in World War 2?

Q- ships were disguised merchant ships that carried cannons depth charges and anti-submarine equipment. They were used as bait for German U-boats and commercial raiders. The above is fine except Q ships were in WW1 not 2