Merge "Renaming "onyx" to "encoder"."