More clean up of yard naming vis a vis application kind