Better handling of long block type names