change function name to convention