Unify more return value variables names to ret