More concurency examples and a couple renames

Change-Id: I6b28f0582d5c2b77f2ca1ba416540a9e6e8f943d