[server] decorators moved and renamed the way those should be named