reference updates
Land #2028, update references for multiple modules