Rename things so we can add some functionality