Merge pull request #1540 from wpaulino/rename-config-fields