Fixing set name functionality