Adding change to generate file name equal to java class name