fix naming issues
Merge branch 'master' of github.com:mod01/alr