Rename misleading variables in old fixture tasks
Refactor configuration files