Variables are now named according to their yaml name, not according to flags. Fixes #243