Change Admin entries to read service/package definitions, for clariy