Rework QNameStep API integration