More consistency across shortcodes

All shortcodes are now capitalised variable names