Renamed annotations to match new model
Merge branch 'master' of github.com:raulcf/Seep