I think we should continue to follow mixed-case notation instead of underscores.