Some renaming and additional doc