Updated to reflect 32-bit target.
Cleaned up and updated (corrected) target names.