Refactored name of application kind (type) to kind