Changed the body of Name() to be safer