Use consistent labels in admin.
Merge pull request #94 from benkonrath/consistent-admin-labels

Use consistent labels in admin