Rename datepicker behavior
Cleanup