Rewrite code for clarity

I spent a bit too much time down a rabbit hole yesterday because I misunderstood what a method was returning because of its name and also misunderstood what these rake tasks were supposed to be doing because of their descriptions. This rewrites and renames things to make it clearer what things actually mean and do.