Review and refactor
no camel case for rest names
Merge branch 'master' into AldwinDelgado