refactored name of uima to nlp
merge