[NUCCORE-1122] Remove hardcoded property names!