[no ci]
Work in progress.
Properly handle subnames