Merge "Remove 'Locked' from method names (6/n)"