update naming and specify application groups as a phase 2 feature