Moved id and name to the start of item definitons.