Added unified naming strategy.