Use correct function names
Close DEV-44 #resolved #fixed