Ensure we're properly shortening all region types