minor improvements to inline rename