Improved support for Froyo devices
Changed codes and name in some cases