Updated names based on WRI standard