Bump to latest SDK and handle renames