Crypted Name => Uncrypt Name logic changed