Merge pull request #43 from vaibhavsagar/master

Fix usage of just_name() after the big 2.0 code re-org