PIM-1794: Fix PMd issues with long variable names