Update CamRanger for new naming conventions
Merge pull request #1630 from Cottser/camranger

Update CamRanger for new naming conventions