refactor names in Apache Rave adapter