Updated to new terminology