Formatting and naming

to make it consistent with the rest of the server