You make a point re. naming.
But maybe it's clearer to just use a lock, dunno. For the moment we don't have multithreading scenario, but just in case.