Removed unnecessary underscores from namespace names

Ignore-this: 8e6de1ef84166c7a5af31225d706da0d

darcs-hash:20091116120308-b22ec-3fbb18682a18f4e01d7293180a64e60030dd60b8