Attribute names should be consistent with real driver Change-Id: I5e247aeb06f2b361bf72377629f943c9599f609e