Rename things to make more sense