Fixing SetName