Re-prefix button variables
Merge pull request #6 from moneyadviceservice/variables

Re-prefix button variables