Yeah, that's basically how I treat Google stuff with generic names: I call them "Google Maps", "Google Photos", etc. When I hear Apple users talk about their music service, they call it "Apple Music".