Make sure both type name are prepared for a type rename
encapsulate SecondaryIndex.estimateResultRows
patch by Miguel Angel Fernandez Diaz; reviewed by Sam Tunnicliffe for CASSANDRA-6498