Follow coding conventions. More structure renaming. Signed-off-by: Paul Brook <paul@codesourcery.com>