changed namespace and naming of annotations