Update method names to be more descriptive