Refactored method names for proper naming scheme