Rename EffectKind -> Kind for consistency.

Use qualified imports for disambiguation.