PLAT-3850 - Fix topics and property names to follow conventions