Be more consistent with naming