Standardized variable names

We're going to use snakecase for all variables.