Rename and update the definitions
Rename and update the definitions
Fix the incorrect applicaiton name