*) rename models
*) update xmind