blight:rkt some function name fixes