Fix JDK6 compile errors.
Use IDs for names as some items have null names.