Complete conversion of existing Naif components to PCL