ticket_1412: Streamlined acronym logic