Revert "updated unique ids for services and plans"

This reverts commit 35ae3e022a6fcc04c2629171b3e5f281efade0ac.
Revert "rename service label"

This reverts commit 65ce965ddd1feabd3fbfa5f5e9522f1b07055aa9.