Finish clust -> clustering rename (and keep compatibility with -Dts.clust)