reference updates for multiple modules
fix formatting
fix formatting
Land #2006 - Ref updates