changes per pull discussion.  Only one lock, of standard naming convention, switched order of lock/signal