Proper var name used and the change of the names for the generated files