Update focus related methods to have a common naming pattern