Fixing wrong variable name.
Fixing datepicker file conflict see #7149