Core rename continued.