Adding the shortcode
Minor name changes in the plugin