Updated to match d6 naming