Refactor: better names, encapsulate call to MP api
Test project: update settings names