Replaces some remanents of BDP with ISO
Fixes ISO namespaces and other small things