Improved variable naming at script code.