Long-identifier changes