Made some other changes for prettyName()