Update presets to use new addressing scheme