Fix in rename doc calls + minor fixes