rename cluster levels to non-underscore names

Change-Id: Ic9bdafbeb1333699ce424612f8b2e8d8dafb7be2
212 files changed