Bond. Tentative changes to variable naming (all to Viper), that may have to be rolled back in the future.