 AS $$
 DECLARE
     -- TODO: Check and handle existing servers (if needed)
-    final_name text := @extschema@.__CDB_FS_Generate_Object_Name(input_name := server, check_existence := false);
+    final_name text := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := false);
     final_config jsonb := @extschema@.__CDB_FS_credentials_to_user_mapping(@extschema@.__CDB_FS_add_default_options(config));
 BEGIN
     PERFORM @extschema@._CDB_SetUp_User_PG_FDW_Server(final_name, final_config::json);

BEGIN
    RETURN QUERY SELECT 
        -- Name as shown to the user
        @extschema@.__CDB_FS_Extract_Public_Name(s.srvname) AS "Name",

        -- Which driver are we using (postgres_fdw, odbc_fdw...)
        f.fdwname::text AS "Driver",

RETURNS void
AS $$
DECLARE
    final_name text := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := true);
BEGIN
    EXECUTE @extschema@._CDB_Drop_User_PG_FDW_Server(fdw_input_name := final_name, force := true);
END
