Rename date setups for less confusing names.

Change-Id: I9a0ea712f0d6ad85292258c67253fa3529e3b093