Renaming in preparation for migration to GTLib.