Corrected server side conventions