reshuffles names for blackbox/whitebox contexts, changes bundle notation

review @retronym