Rename rich to hmpid etc.