Mostly rename file and variable names to be more consistent. This makes it easier to locate them in the "Actions" tab on github.