EZP-22210: Specs clean-up + update