Naming methods more appropriately