fix broken commit (2267c84d6a6ff071fea59bebd68135523d979e78)
rename some functions as per their function