Some naming convention changes.