Merge changes If2e86889,I5334d75b into lmp-dev

* changes:
  Move from uri to name
  Clean up