Modifies scopes to conform to new format