Using _ as prefix, not suffix… and fixes issue #1435
Updates CHANGELOG