[PATCH v2] Unify names of all lock objects

[Freddie Chopin]

On Mon, 2017-01-30 at 19:57 +0100, Freddie Chopin wrote:
> Most recent patch from Thomas' that adds lock retargeting, with
> changed
> names of objects to work on top of my patch.

Hello group!

Any chance of merging this (and other 2 patches from Thomas)? (;

Thanks in advance!
FCh