Capitalize for consistency
Add data prefix to flavour object attributes
Replace sources directly, not via flag