Refactored function names to match code guidelines