Cleaned camera naming