Update fire and file naming convention..