Update specs to use new format