rename fepackages to fepkgs, and services to base_svcs