Fixing save name issues