Rename initial crisis collect. & small code fixes