BVAL-407 Rename unwrap parameterized type