Better support for lock name