adjust API for robustness
Merge pull request #2443 from yorkerlin/develop

rename the GPC modular