Fix handling of SP renames