Fix news and announcement naming conventions for custom layout.