@optional modifier added to aux. protocols and one of these is also renamed.