BC Break: Change naming, fix some minor issues.
Merge pull request #2 from jails/master

BC Break: Change naming, fix some minor issues.