Rename things. General cleanup