I think this is best handled if you regress the different spirt types to their roots.
The new 4e setting is a somewhat ecletic mix of Greek/Welsh/Norse mythologies, and I think it has worked quite well.
In that regard, I think Hong is 100% correct.. Dryads, Naids, etc, are *elemental spirits*...