Rename and inline methods