Rename files
Fix date handler