         {
             let fn = { () -> Void in
                 // this also tests re-entrancy
-                let gotLock = self.lock.executeWithTimeout(LongWaitTimeout) {
+                let gotLock = self.lock.execute(timeout: LongWaitTimeout) {
                     executions += 1
 
                     XCTAssertTrue(protect == 0)


        override func main()
        {
            let gotLock = lock.executeWithTimeout(ShortWaitTimeout) {
                XCTAssertTrue(false, "we weren't expecting to be able to grab this lock")
            }



            for _ in 0..<TestThreadIterations {
                if let timeout = lockTimeout {
                    let executed = lock.execute(timeout: timeout, fn)
                    XCTAssertTrue(executed)
                }
                else {
