Normalize definitions