Improved some camera naming