updated compound definitions to use underscores