note name fixes

Change-Id: Iaeadec7ece927f45c774a4cfc2ecb90ce5262ff6