Added better naming for plotting