Now returns appropriate enharmonic name