Fix NFC force close at boot

Change-Id: Id57cc43b6e3f534d054a91314f47d615c55da88b
Fix here, rename there