Decided to make all the words more consitantly named.  One set of words start with semaphore and another set start with sema.