Replace 'attr' with 'data' as appropriate

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>