To newer names better reflecting their types and yet sorting together with folder.go. Doing it now without asking because there are no open PRs that will get killed by it, and to avoid bikeshedding the names.
