Closes #36: adapt references to old type params