CHANGE: Api name issue #119