Change variable naming to snake_case