Attempt to fix NFC
Change file in lib/hw attempt to fix NFC
fix naming