Rename def/map to def/terms