Rename and optimize methods.