Be more consistent in naming