renaming and doc fix