Changed GUI related file names as well as content/variable names