Updating notices to use 2.1 Notice API #62