Only in dungeons and dragons.
http://en.wikipedia.org/wiki/Talk:Marid#Disputed
Marid is an arabic word generally translated as "Devil", sometimes "Giant", "Ogre", etc. Westerners decided that it must be somehow related to the western word Marine, and thus to water - but this isn't true, it's cognate to other Semitic words meaning "rebellious".
In 1,001 arabian nights, Marids are simpler bigger and more powerful Efreet.
Read this too:
http://en.wikipedia.org/wiki/Genie
Now, I know that we're not constrained to use "authentic" folklore, and that we can use four-element jinn if we want to go to western sources, just like we don't have to use "authentic" ninja or alchemists or anything else.
However, in this case, I think it'd be much better to use the more folklorically accurate Jinn from the Qu'ran - who are all made out of smokeless fire.