[CXF-5311] Keeping refactoring and experimenting with property names