Refactor: Rename static function