Rename security->server, move callout down