Properly name blocks in UVM generation