Renamed some idioms for clarity and alignment with other idioms