Slightly improve terminology rendering;

Fix bug in id code synthesis