command refactoring and services relabeling