Got rid of with-naming-strategy.