Renaming per issue #287 to match RxJava