Yeah, I looked up the naginata, too. The blade on that looked slender and the article says they usually have a tsuba (hand guard) which Margot's weapon doesn't have. Her weapon has a much heavier looking blade, more like the pudao.
Maybe it's a hybrid.
Like you said, though, they are both basically the same type of weapon.