cleaning up names of k$ vars

closes gh-49