Aligned with coding conventions

PLAT-1749