Firefox not WaterWolf makes me sad :( Maybe file a followup to switch the remaining things that use moz-specific names over?