Change name properly