rename some of the function defines to fix issue #55
update changelog