Improve id naming.