Refactor from camera specific naming to general naming schema
Renamed from camera specific to genral naming schema
Finished refactoring for now