Merge pull request #3996 from spigad/master

switch from ServerInteraction to RESTInteraction
fix typo