Use improved naming strategy.