Correct names generator.
New changes for the warranty.