More consistency across shortcodes

All shortcodes are now capitalised variable names
Merge pull request #1 from Accommodavid/dev

More consistency across shortcodes