Switch model name to match distro
Swapped shortcode views for generic helpers