Revert "Rename date setups for less confusing names."

This reverts kiwi commit 029d38d4304cae7a5d55b8a99d18ab50953fdf48.
It's really last month/last week, not the last 7 days (that would mean
this week) and last 30 days (that would mean this month)

Change-Id: I61ef9a90ec6f4de16789fba38fb3a352469810ba