[t3275] Better naming for clip types in Media Gallery
Review fixes