Updated references to new lock manager