Switch template tags to use hyphens instead of underscores