Question on code to replace global-in/global-out

I have started upgrading a couple of my devices to 6.2 now. I know one of the changes they put in place were to remove the global-in/global-out. I am trying to figure out how to updated my speed limiting queues now that those are not available. My question is now in instead of global-in/global out use my interfaces wan/lan respectivly?

My basic code is below:

/queue type
add kind=pcq name=PCQ_download pcq-burst-rate=0 pcq-burst-threshold=0 pcq-burst-time=10s pcq-classifier=dst-address pcq-dst-address-mask=32 pcq-dst-address6-mask=128 pcq-limit=50 pcq-rate=1M pcq-src-address-mask=32 pcq-src-address6-mask=128 pcq-total-limit=2000
add kind=pcq name=PCQ_upload pcq-burst-rate=0 pcq-burst-threshold=0 pcq-burst-time=10s pcq-classifier=src-address pcq-dst-address-mask=32 pcq-dst-address6-mask=128 pcq-limit=50 pcq-rate=1M pcq-src-address-mask=32 pcq-src-address6-mask=128 pcq-total-limit=2000
/queue simple
add burst-limit=0/0 burst-threshold=0/0 burst-time=0s/0s direction=both disabled=no interface=all limit-at=0/0 max-limit=0/0 name=queue2 parent=none priority=8 queue=PCQ_upload/PCQ_download target-addresses=192.168.100.0/24 total-queue=default-small
/queue tree
add burst-limit=0 burst-threshold=0 burst-time=0s disabled=no limit-at=0 max-limit=0 name=queue1 packet-mark=all parent=global-in priority=8 queue=PCQ_download
add burst-limit=0 burst-threshold=0 burst-time=0s disabled=no limit-at=0 max-limit=0 name=queue2 packet-mark=all parent=global-out priority=8 queue=PCQ_upload