Cosmetic update of OOP wrapper

Make it more natural names.