Update shortcode and rename
Update names
Fix renderContent and add exception
checkin nercomp changes