Change shortcode handlers with more appropriate names