Rename and improved docsg