fix NFC, remove suffix and use default name

Change-Id: Ic0830a687cf93a6ffc36285f457f5c1a25ee55d1