Change names for clarity
Synchronize on the lock message instead of the lock to prevent a deadlock