Rename the 'new' 4GB WiFi PW2

And settle on 'l' (for large storage space) as a suffix in the nicknames
for the new 4GB variants.
Id'ed the (US) 4GB 3G PW2