+1  Since we're about to break backwards compatibility anyway - let's rename all fields to be the same as in requests