Droid 2 (or whatever it's called) for Verizon breaks cover once again

Nothing new here, but at this point, Motorola's delicious duo of fresh Android phones for Verizon is leaking like... well, like a leaky faucet, we suppose. We've already got the full scoop on the keyboardless 4.3-inch Droid X -- a beast ready to take on sworn enemies from HTC like the EVO 4G and the Droid Incredible -- and we've seen plenty of details on the so-called Droid 2, too. The latter appears destined to replace the original Droid with a better keyboard layout and ever-so-gently refined ergonomics, but the latest leak from a Gizmodo tipster confirms that the cam's still 5 megapixels and it's currently running Android 2.1 atop Moto's new-look Blur (interestingly, the "Droid 2" name couldn't be confirmed). Apparently it's set for release in the "next few weeks," which would line up with rumors we've heard in the past of a launch windows somewhere between July and August -- so here's the real question: X or 2?