I'd say succubus falls under demon. Fae folks are usually fairies. Not the oh so goody goody modern fairies mind you, but those fae from older stories. Which includes the dullahan.