Major changes to sandbox target names