Fixed naming conventions. Added nested types.