Corrected naming scheme, and logic for multiple cameras/device