Issue#161: Fix over zelous rename of libs
Issue#161: Move VPI_<state> to GPI level