rb function name cleanup