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

...t)

Few more changes please.