naughty naming fix