Capitalize updates

Change-Id: I40a8d94e452d31dbddee429c2ebbf6d0756395ca