BC Break: Change naming, fix some minor issues.