Update method naming and specs