Renaming things so we can add another UI