Change name to beautify