Use more consistent dash/underscore naming, at least for top-level stuff