Rename to match show title and some tweaks