CF-224 refactored label logic and clearer names