Fixed issue in dev branch with naming crash after #1701 fix.