Module names cleanup.

Also, weird diode module removed.