Renamed from charmm36 -> charmm