Remove hard-coded atom names