CE-1018 Fix naming conventions and simplify Subscriber API interface