NAMEISPI / DESCISPI check

Added NAMEISPI & DESCISPI where necessary