Rename and simplify API and transformers