renamed classes
Merge branch 'development' of github.com:kewgen/aow into development