Rename things to get rid of warining on publishing