Charge/Pull rename and k->K (r598658)