Rename set, add, delete for 2.0 API

Change-Id: I106e19a26b91fe2f25b7036e33f79f5e5884c037