updated some class-names to retain compatibility with OC5