align function naming

remove possible confusing names