Merge "Remove suggested key names as its confusing." into lmp-dev