Added TableNameNormalizer