Remove hard-coded atom names
Merge branch 'master' into plumed