Clean-up.
Re-name "SimpleDistanceBased" to "NonHierarchicalDistanceBased"