0.1.3 improved name derivation.