HR-384 Modifications for primary jobs and variable name changes