[nim, billy] #X renames distribution planning and distribution reporting