Rename xblock_field_data to xmodule_field_data