Added support for uppercase and underscores in shortcodes