Renames.

Change-Id: Ieedbe93c5ea17fed7f4ae0a0db4798e7e2ca531a
Fix software members list.

Change-Id: I8f67b33d219813874b8f4b5c293135d6572d2d5d