rename and inline keys