Updates to match changed names in Polytrix