organize default id, fix name