Fixed event 228 failure due to naming of Device fields.