Change name to valid