Wcctnoam 

That seems fair, and I think the separation will eventually be needed. I have created the species:classical kelpie and species:farasian kelpie tags.
The already existing kelpie tag is currently un-aliased, but I'm considering aliasing it to the classical tag.
EDIT: I've also made species:farasian abada
The already existing kelpie tag is currently un-aliased, but I'm considering aliasing it to the classical tag.
EDIT: I've also made species:farasian abada