Amend Account mapping.

Rename some classes for more coherence.