Revert "Renamed terms"

This reverts commit e2ce1a5e89607dbdcb5dbb0d8fa3e98f1080f7cf.