Hi
I would with the second option with the way sensor was registered.
You can change the sensor name from Device>edit the concerned device settings and change the name or any other details for that matter and save it.
Thanks and rate if helps,
Yogesh.