[#1374] datastore:rename variable to avoid confusing name clash