Updated existing specs (naming and Subject attribute)