[PLAT-5519] Constant should be used to ensure name changes aren't missed
[PLAT-5520] Inputs were being checked for null but were being used even if they were null