Rename incident_dir to incidents_dir
Rename storedir to storage_dir