Trying to get the rename to play nice.