Update to work with renamed NBL libraries.