Bug fix 2
Fix Setting Names