Rename spans and shifts so they play nice with other frameworks.