Minor changes to naming conventions
Merge branch 'master' of github.com:sympolinc/Fido