Improved method names and order.