Towards a more consistent naming scheme.