Fixed naming on rest server