This patch renames some variables to avoid warnings like: 'e' doesn't conform to snake_case naming style (invalid-name)