Data recording now keyed off device friendly name rather than ID